fix create directory chain. close #3

doublefint · Nov 24, 2016 · 4f225d2 · 4f225d2
1 parent 83e56db
commit 4f225d2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/sc.all.cls b/sc.all.cls
@@ -117,12 +117,20 @@ ClassMethod import(qspec = "cku-d", ByRef err = "", recurse = 1, ByRef loaded =
 /// Translate ( codename ) into ( filename )
 ClassMethod filename(code)
 {
+	#define log(%dir,%sc) w !, "mkdir ", %dir, " ", %sc
 	s wd = ..workdir() 
-	d:'##class(%File).DirectoryExists( wd ) ##class(%File).CreateDirectoryChain( wd )
+	if '##class(%File).DirectoryExists( wd ) {
+		s sc = ##class(%File).CreateDirectoryChain( wd )
+		$$$log(wd,sc)
+	}
 	s filename = ##class(%File).NormalizeFilename( code, wd )
 	#; for *.dfi filename can contain folders
 	s path = ##class(%File).GetDirectory(filename) 
-	d:'##class(%File).DirectoryExists( path ) ##class(%File).CreateDirectoryChain( path )
+	if '##class(%File).DirectoryExists( path ) {
+		s sc=##class(%File).CreateDirectoryChain(path)
+		$$$log(path,sc)
+	}
+
 	Q filename
 }
 

diff --git a/sc.all.sub.cls b/sc.all.sub.cls
@@ -7,16 +7,32 @@ Class sc.all.sub Extends sc.all
 /// etc
 ClassMethod filename(code)
 {
+	#define log(%dir,%sc) w !, "mkdir ", %dir, " ", sc
+
+	s wd = ..workdir() 
+
+	if '##class(%File).DirectoryExists( wd ) {
+		s sc = ##class(%File).CreateDirectoryChain( wd )
+		$$$log(wd,sc)
+	}
+
 	s ext = $p( code, ".", * ), ext = $zcvt( ext, "l" )
 	#; for each type - different directory
-	s wd = ..workdir() s:ext'="" wd = ##class(%File).NormalizeDirectory( ext, wd ) 
-	d:'##class(%File).DirectoryExists( wd ) ##class(%File).CreateDirectoryChain( wd )
+
+	s:ext'="" wd = ##class(%File).NormalizeDirectory( ext, wd ) 
+	if '##class(%File).DirectoryExists( wd ) {
+		s sc = ##class(%File).CreateDirectoryChain( wd )
+		$$$log(wd,sc)
+	}
 
 	s filename = ##class(%File).NormalizeFilename( code, wd )
 	#; for *.dfi filename can contain folders
 	if ext = "dfi" {
 		s path = ##class(%File).GetDirectory( filename ) 
-		d:'##class(%File).DirectoryExists( path ) ##class(%File).CreateDirectoryChain( path )
+		if '##class(%File).DirectoryExists( path ) {
+			s sc = ##class(%File).CreateDirectoryChain( path )	
+			$$$log(path,sc)
+		} 
 	}
 	Q filename
 }