Merge pull request #11 from intersystems-ru/master

Fixed error logging for importUpdated
doublefint · Apr 8, 2017 · 23dfd49 · 23dfd49
2 parents f56b6b5 + 30a9651
commit 23dfd49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/dev.md b/dev.md
diff --git a/sc.code.cls b/sc.code.cls
@@ -87,10 +87,10 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
 	#define push(%dir) s dirs( $i( dirs ) ) = %dir
 	#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir )  k:%i'="" dirs(%i)
 	#define isDirectory(%type) ( %type = "D" )
-	#define log w !, filename, " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
+	#define log w !, $piece(filename,..workdir(),2), " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
 
 	s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
-
+	if verbose w "Starting import of updated files in "_dir,!
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
 
 		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
@@ -177,8 +177,10 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
 	#define push(%dir) s dirs( $i( dirs ) ) = %dir
 	#define next(%i,%dir) s %i=$o( dirs( "" ), 1, %dir )  k:%i'="" dirs(%i)
 	#define isDirectory(%type) ( %type = "D" )
-	#define log w !, filename, " -> ", codename, " ", +sc
+	#define log w !, $piece(filename,..workdir(),2), " ", +sc, $S(sc=1:"",1: " "_$system.Status.GetOneErrorText(sc))
+
 	s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
+	if verbose w "Starting import of updated files in "_dir,!
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
 
 		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )