@@ -74,13 +74,11 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
74
74
75
75
s sc = 1 , dirs = " " , dir = ..workdir () $$$push(dir )
76
76
77
- s rs = ##class (%ResultSet ).%New ( " %Library.File:FileSet" )
78
77
for { $$$next(i ,dir ) Q :i =" " Q :dir =" "
79
78
80
- s sc = rs .Execute ( dir , filemask ) Q :'sc
81
-
82
- while rs .Next () {
79
+ s rs = ##class (%File ).FileSetFunc ( dir , filemask , , 1 )
83
80
81
+ while rs .%Next () {
84
82
s filename = rs .Name
85
83
86
84
if $$$isDirectory(rs .Type ) {
@@ -103,7 +101,6 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
103
101
104
102
Q sc
105
103
}
106
-
107
104
/// get or set working directory for export/import source
108
105
ClassMethod workdir (workdir )
109
106
{
@@ -171,14 +168,11 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
171
168
#define log w !, filename , " -> " , codename , " " , +sc
172
169
173
170
s sc = 1 , dirs = " " , dir = ..workdir () $$$push(dir )
174
-
175
- s rs = ##class (%ResultSet ).%New ( " %Library.File:FileSet" )
176
171
for { $$$next(i ,dir ) Q :i =" " Q :dir =" "
177
172
178
- s sc = rs .Execute ( dir , filemask ) Q :'sc
179
-
180
- while rs .Next () {
173
+ s rs = ##class (%File ).FileSetFunc ( dir , filemask , , 1 )
181
174
175
+ while rs .%Next () {
182
176
s filename = rs .Name
183
177
184
178
if $$$isDirectory( rs .Type ) {
0 commit comments