Skip to content

Commit b84bfed

Browse files
committed
Fixed bug with importUpdated
fixed codename to let codets expression be calculated properly
1 parent 2d05105 commit b84bfed

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

sc.alles.cls

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ Class sc.alles [ Abstract ]
66
/// export all available code
77
ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0)
88
{
9-
9+
1010
#define export(%code, %file) ##continue
1111
s sc = $system.OBJ.ExportUDL(%code, %file,"/diffexport") ##continue
1212
w +sc ##continue
1313
if 'sc d $system.OBJ.DisplayError(sc)
14-
14+
1515
#define isGenerated(%code) ##class(%RoutineMgr).IsGenerated( %code )
1616
#define isPercented(%code) ("%" = $e(%code))
1717
#define isMapped(%code) ##class(%RoutineMgr).IsMapped( %code )
1818
#define log w !, code, " -> ", filename, " "
19-
19+
2020
#define mkdir(%filename) ##continue
2121
s path = ##class(%File).GetDirectory( %filename ) ##continue
2222
if '##class(%File).DirectoryExists( path ) { ##continue
@@ -25,7 +25,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0)
2525
}
2626

2727

28-
28+
2929
#; classes
3030
s rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
3131
if rs.Execute() {
@@ -152,10 +152,10 @@ ClassMethod filename(code)
152152
#; for each type - different directory
153153

154154
s:ext'="" wd = ##class(%File).NormalizeDirectory( ext, wd )
155-
155+
156156
#; directory must exist before any call (%File).NormalizeFilename( , wd)
157157
if '##class(%File).DirectoryExists( wd ) {
158-
s sc = ##class(%File).CreateDirectoryChain( wd )
158+
s sc = ##class(%File).CreateDirectoryChain( wd )
159159
$$$log(wd,sc)
160160
}
161161

@@ -176,7 +176,6 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
176176
#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir ) k:%i'="" dirs(%i)
177177
#define isDirectory(%type) ( %type = "D" )
178178
#define log w !, filename, " -> ", codename, " ", +sc
179-
180179
s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
181180
for { $$$next(i,dir) Q:i="" Q:dir=""
182181

@@ -193,8 +192,8 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
193192
s filets = rs.DateModified
194193
s codename = ..codename( filename, .ext )
195194
s codets = ..codets( codename, ext )
196-
197195
if ( filets '] codets ) continue
196+
//w codename,! B "L"
198197

199198
/*
200199
w !, " ************* import ************** "
@@ -230,6 +229,7 @@ ClassMethod codename(filename, ByRef ext = "")
230229
s fullname = $tr( codename, "\", "/" ) ; return fullname for dfi in $$$IsWINDOWS
231230
Q $p( fullname, ".", 1, *-1 ) ;remove extension
232231
}
232+
if (ext ="cls")!(ext="int")!(ext="inc")!(ext="mac") s codename=$tr(codename,"/",".")
233233
Q codename
234234
}
235235

@@ -252,4 +252,3 @@ ClassMethod codets(codename, ext)
252252
}
253253

254254
}
255-

0 commit comments

Comments
 (0)