Fixed directory scanning

doublefint · Jan 22, 2017 · 4f8d9ea · 4f8d9ea
1 parent bd96d22
commit 4f8d9ea
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/sc.alles.cls b/sc.alles.cls
@@ -74,13 +74,11 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
 
 	s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
 
-	s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
 
-		s sc = rs.Execute( dir, filemask ) Q:'sc
-
-		while rs.Next() {
+		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
 
+		while rs.%Next() {
 			s filename = rs.Name
 
 			if $$$isDirectory(rs.Type) {
@@ -103,7 +101,6 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
 
 	Q sc
 }
-
 /// get or set working directory for export/import source
 ClassMethod workdir(workdir)
 {
@@ -171,14 +168,11 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
 	#define log w !, filename, " -> ", codename, " ", +sc
 
 	s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
-
-	s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
 
-		s sc = rs.Execute( dir, filemask ) Q:'sc
-
-		while rs.Next() {
+		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
 
+		while rs.%Next() {
 		   s filename = rs.Name
 
 		   if $$$isDirectory( rs.Type ) {