Skip to content

Commit 23dfd49

Browse files
authored
Merge pull request doublefint#11 from intersystems-ru/master
Fixed error logging for importUpdated
2 parents f56b6b5 + 30a9651 commit 23dfd49

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

dev.md

Whitespace-only changes.

sc.code.cls

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
8787
#define push(%dir) s dirs( $i( dirs ) ) = %dir
8888
#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir ) k:%i'="" dirs(%i)
8989
#define isDirectory(%type) ( %type = "D" )
90-
#define log w !, filename, " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
90+
#define log w !, $piece(filename,..workdir(),2), " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
9191

9292
s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
93-
93+
if verbose w "Starting import of updated files in "_dir,!
9494
for { $$$next(i,dir) Q:i="" Q:dir=""
9595

9696
s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
@@ -177,8 +177,10 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
177177
#define push(%dir) s dirs( $i( dirs ) ) = %dir
178178
#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir ) k:%i'="" dirs(%i)
179179
#define isDirectory(%type) ( %type = "D" )
180-
#define log w !, filename, " -> ", codename, " ", +sc
180+
#define log w !, $piece(filename,..workdir(),2), " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
181+
181182
s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
183+
if verbose w "Starting import of updated files in "_dir,!
182184
for { $$$next(i,dir) Q:i="" Q:dir=""
183185

184186
s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )

0 commit comments

Comments
 (0)