Merge pull request #4 from intersystems-ru/master

Folder structure for classes

Author: doublefint

.DS_Store

@@ -1,24 +1,24 @@
-/// special edition of sc.all.sub for ES without dependencies  
+/// special edition of sc.all.sub for ES without dependencies
 /// Export different types of modules in different subfolders
 Class sc.alles [ Abstract ]
 {
 
 /// export all available code
-ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 1)
+ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0)
 {
-		
+
 	#define export(%code, %file) $system.OBJ.ExportUDL(%code, %file,"/diffexport")
-	#define isGenerated(%code) ##class(%RoutineMgr).IsGenerated( %code )	
+	#define isGenerated(%code) ##class(%RoutineMgr).IsGenerated( %code )
 	#define isPercented(%code) ("%" = $e(%code))
 	#define isMapped(%code) ##class(%RoutineMgr).IsMapped( %code )
 	#define log w !, code, " -> ", filename, " "
-		
-	#; classes 
+
+	#; classes
 	s rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
 	if rs.Execute() {
-		
+
 		while rs.%Next(){
-			
+
 			s code = rs.Name _ ".cls", isSystem = rs.System
 			if ( 'system && isSystem ) continue
 			if ( 'generated && $$$isGenerated( code ) ) continue
@@ -27,29 +27,29 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 1)
 			s filename = ..filename( code )
 			$$$log
 			w $$$export( code, filename )
-			
+
 		} s rs=""
-	} 
-	
+	}
+
 	#; routines
 	s rs = ##class(%ResultSet).%New("%Routine:RoutineList")
 	if rs.Execute() {
-		
+
     	while rs.%Next() {
-	    	
+
 	 		s code = rs.Name
 	 		if ( 'generated && $$$isGenerated( code ) ) continue
 	 		if ( 'percent && $$$isPercented( code ) ) continue
 			if ( 'mapped && $$$isMapped( code ) ) continue
-			
+
 			s filename = ..filename( code )
 			$$$log
 			w $$$export( code, filename )
-			
+
 	    } s rs=""
 	}
-	
-	
+
+
 	#; dfi
 	#define export(%code, %file)  ##class(%DeepSee.UserLibrary.Utils).%Export( %code, %file, 0 )
 	s sql = "Select fullName as Name From %DeepSee_UserLibrary.FolderItem"
@@ -58,9 +58,9 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 1)
 		s code = rs.Name, filename = ..filename( code_".dfi" )
 		$$$log
 		w $$$export( code, filename )
-		
+
 	} s rs=""
-	
+
     Q
 }
 
@@ -71,21 +71,19 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
 	#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, dirs = "", dir = ..workdir() $$$push(dir)
-		
-	s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
+
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
-		
-		s sc = rs.Execute( dir, filemask ) Q:'sc
-		
-		while rs.Next() {
 
+		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
+
+		while rs.%Next() {
 			s filename = rs.Name
 
 			if $$$isDirectory(rs.Type) {
-				if recurse $$$push(filename) 
-				continue  
+				if recurse $$$push(filename)
+				continue
 			}
 
 			s ext = $p( filename, ".", * )
@@ -100,16 +98,15 @@ ClassMethod import(filemask = "*.*", qspec = "cku-d", ByRef err = "", recurse =
 
 	    }
 	}
-		
+
 	Q sc
 }
-
 /// get or set working directory for export/import source
 ClassMethod workdir(workdir)
 {
 	s gln = ..gln() s:$d(workdir) @gln = workdir
 	///zu(12) namespace directory by default
-	#define nsdir $zu(12,"") 
+	#define nsdir $zu(12,"")
 	Q $g(@gln, $$$nsdir)
 }
 
@@ -125,31 +122,39 @@ ClassMethod gln() [ CodeMode = expression, Private ]
 ClassMethod filename(code)
 {
 	#define log(%dir,%sc) w !, "mkdir ", %dir, " ", sc
-	
-	s wd = ..workdir() 
-	
+
+	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:ext'="" wd = ##class(%File).NormalizeDirectory( ext, 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 *.cls Package.Subpackage.ClassName.cls -> Folder/Subfolder/ClassName.cls
+	if ext ="cls" {
+		set foldercode=$piece(code,".",*-2)
+		set foldercode=$translate(foldercode,".","/")
+		set foldercode=foldercode_"/"_$piece(code,".",*-1,*)
+		set filename=##class(%File).NormalizeFilename( foldercode, wd )
+	}
+
 	#; for *.dfi filename can contain folders
-	if ext = "dfi" {
-		s path = ##class(%File).GetDirectory( filename ) 
+	if ext = ("dfi")!("cls") {
+		s path = ##class(%File).GetDirectory( filename )
 		if '##class(%File).DirectoryExists( path ) {
-			s sc = ##class(%File).CreateDirectoryChain( path )	
+			s sc = ##class(%File).CreateDirectoryChain( path )
 			$$$log(path,sc)
-		} 
+		}
 	}
 	Q filename
 }
@@ -161,62 +166,59 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
 	#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
-	
+
 	s sc = 1, dirs = "", dir = ..workdir() $$$push(dir)
-		
-	s rs = ##class(%ResultSet).%New( "%Library.File:FileSet" )
 	for { $$$next(i,dir) Q:i=""  Q:dir=""
-		
-		s sc = rs.Execute( dir, filemask ) Q:'sc
-		
-		while rs.Next() {
-		   
-		   s filename = rs.Name 		   
-		   
+
+		s rs = ##class(%File).FileSetFunc( dir, filemask, , 1 )
+
+		while rs.%Next() {
+		   s filename = rs.Name
+
 		   if $$$isDirectory( rs.Type ) {
-			 if ( recurse ) $$$push(filename) ;push directory 
-			 continue  
+			 if ( recurse ) $$$push(filename) ;push directory
+			 continue
 		   }
-		   
+
 		   s filets = rs.DateModified
-		   s codename = ..codename( filename, .ext )      
+		   s codename = ..codename( filename, .ext )
 		   s codets = ..codets( codename, ext )
-		   
+
 		   if ( filets '] codets ) continue
-		   
+
 		   /*
 		   w !, " ************* import ************** "
 		   w !, "file: ", filets
 		   w !, "code: ", codets
 		   */
-		   
+
 		   if ext = "dfi" {
-			   
+
 			   s sc = ##class(%DeepSee.UserLibrary.Utils).%Import( filename, 1, 0, 0, "", .loaded )
-		   
+
 		   } else {
-			   
+
 			   #; drop existing code before import ( purge DateModified )
 			   s:codets'="" sc = ##class(%RoutineMgr).Delete( codename )
 			   s sc = $system.OBJ.Load( filename, qspec, .err, .loaded)
-			   
+
 		   }
-		   
+
 		   if verbose $$$log
 	    }
 	}
 	Q sc
 }
 
-/// presumable codename 
+/// presumable codename
 ClassMethod codename(filename, ByRef ext = "")
 {
 	s ext = $p( filename, ".", * ), ext = $zcvt( ext, "l" )
 	s path = ##class(%File).NormalizeDirectory( ext, ..workdir() )
 	s codename = $p( filename, path, 2 )
 	if ext = "dfi" {
 		s fullname  = $tr( codename, "\", "/" ) ; return fullname for dfi in $$$IsWINDOWS
-		Q $p( fullname, ".", 1, *-1 ) ;remove extension 
+		Q $p( fullname, ".", 1, *-1 ) ;remove extension
 	}
 	Q codename
 }
@@ -227,9 +229,9 @@ ClassMethod codets(codename, ext)
 	if ext'="dfi" {
 		s ts = ##class(%RoutineMgr).TS( codename )
 	} else {
-		s sql="Select timeModified From %DeepSee_UserLibrary.FolderItem Where fullname = ?"	
+		s sql="Select timeModified From %DeepSee_UserLibrary.FolderItem Where fullname = ?"
 		s rs = ##class(%SQL.Statement).%ExecDirect( , sql, codename )
-		if rs.%Next() { 
+		if rs.%Next() {
 			s utcts = rs.timeModified
 			s utch = $zdth( utcts, 3, , 3 ) ;utc internal format
 			s loch = $zdth( utch, -3 ) ; utc to local timezone
@@ -240,4 +242,3 @@ ClassMethod codets(codename, ext)
 }
 
 }
-