Skip to content

Commit 4f8d9ea

Browse files
committed
Fixed directory scanning
1 parent bd96d22 commit 4f8d9ea

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

sc.alles.cls

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,11 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
7474

7575
s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
7676

77-
s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
7877
for { $$$next(i,dir) Q:i="" Q:dir=""
7978

80-
s sc = rs.Execute( dir, filemask ) Q:'sc
81-
82-
while rs.Next() {
79+
s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
8380

81+
while rs.%Next() {
8482
s filename = rs.Name
8583

8684
if $$$isDirectory(rs.Type) {
@@ -103,7 +101,6 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
103101

104102
Q sc
105103
}
106-
107104
/// get or set working directory for export/import source
108105
ClassMethod workdir(workdir)
109106
{
@@ -171,14 +168,11 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
171168
#define log w !, filename, " -> ", codename, " ", +sc
172169

173170
s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
174-
175-
s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
176171
for { $$$next(i,dir) Q:i="" Q:dir=""
177172

178-
s sc = rs.Execute( dir, filemask ) Q:'sc
179-
180-
while rs.Next() {
173+
s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
181174

175+
while rs.%Next() {
182176
s filename = rs.Name
183177

184178
if $$$isDirectory( rs.Type ) {

0 commit comments

Comments
 (0)