Skip to content

Commit b5248bd

Browse files
committed
Error log fixed, extensions fixed - all in lowercase now, default extensions for import mode introduced
1 parent 4fff793 commit b5248bd

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

sc.code.cls

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = ""
8787
}
8888

8989
/// import all from workdir
90-
ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse = 1, ByRef loaded = "", verbose = 1) As %Status
90+
ClassMethod import(filemask = "*.xml;*.cls;*.mac;*.int;*.inc;*.dfi", qspec = "cku-d", ByRef err = "", recurse = 1, ByRef loaded = "", verbose = 1) As %Status
9191
{
9292
#define push(%dir) s dirs( $i( dirs ) ) = %dir
9393
#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir ) k:%i'="" dirs(%i)
@@ -124,11 +124,20 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
124124

125125
}
126126
// compile all the loaded classes to obey dependencies
127-
s sc=$system.OBJ.CompileList( .loaded, "ckbr-d/multicompile",.err )
127+
s sc=$system.OBJ.CompileList( .loaded, "cukbr-d/multicompile",.err )
128128

129129
}
130+
130131
if verbose {
131-
if $D(err) zw err
132+
133+
if $D(err) {
134+
s i=$Order(err(""))
135+
while i'="" {
136+
w !,err(i)
137+
s i=$O(err(i))
138+
}
139+
}
140+
132141
w !,!,"#; Imported from ", ..workdir()
133142
}
134143
Q sc
@@ -213,6 +222,8 @@ ClassMethod filename(code)
213222
}
214223

215224
s filename = ##class(%File).NormalizeFilename( code, wd )
225+
#; lowercase file extension
226+
s $p(filename,".",*)=ext
216227
//B:code="DPRep.Rest.JSON.cls" "L"
217228
#; for *.cls Package.Subpackage.ClassName.cls -> Folder/Subfolder/ClassName.cls
218229
if ext ="cls" {

0 commit comments

Comments
 (0)