Skip to content

Commit

Permalink
Fixed bug with importUpdated
Browse files Browse the repository at this point in the history
fixed codename to let codets expression be calculated properly
  • Loading branch information
evshvarov committed Jan 26, 2017
1 parent 2d05105 commit b84bfed
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions sc.alles.cls
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ Class sc.alles [ Abstract ]
/// export all available code
ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0)
{

#define export(%code, %file) ##continue
s sc = $system.OBJ.ExportUDL(%code, %file,"/diffexport") ##continue
w +sc ##continue
if 'sc d $system.OBJ.DisplayError(sc)

#define isGenerated(%code) ##class(%RoutineMgr).IsGenerated( %code )
#define isPercented(%code) ("%" = $e(%code))
#define isMapped(%code) ##class(%RoutineMgr).IsMapped( %code )
#define log w !, code, " -> ", filename, " "

#define mkdir(%filename) ##continue
s path = ##class(%File).GetDirectory( %filename ) ##continue
if '##class(%File).DirectoryExists( path ) { ##continue
Expand All @@ -25,7 +25,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0)
}



#; classes
s rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
if rs.Execute() {
Expand Down Expand Up @@ -152,10 +152,10 @@ ClassMethod filename(code)
#; for each type - different directory

s:ext'="" wd = ##class(%File).NormalizeDirectory( ext, wd )

#; directory must exist before any call (%File).NormalizeFilename( , wd)
if '##class(%File).DirectoryExists( wd ) {
s sc = ##class(%File).CreateDirectoryChain( wd )
s sc = ##class(%File).CreateDirectoryChain( wd )
$$$log(wd,sc)
}

Expand All @@ -176,7 +176,6 @@ 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)
for { $$$next(i,dir) Q:i="" Q:dir=""

Expand All @@ -193,8 +192,8 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
s filets = rs.DateModified
s codename = ..codename( filename, .ext )
s codets = ..codets( codename, ext )

if ( filets '] codets ) continue
//w codename,! B "L"

/*
w !, " ************* import ************** "
Expand Down Expand Up @@ -230,6 +229,7 @@ ClassMethod codename(filename, ByRef ext = "")
s fullname = $tr( codename, "\", "/" ) ; return fullname for dfi in $$$IsWINDOWS
Q $p( fullname, ".", 1, *-1 ) ;remove extension
}
if (ext ="cls")!(ext="int")!(ext="inc")!(ext="mac") s codename=$tr(codename,"/",".")
Q codename
}

Expand All @@ -252,4 +252,3 @@ ClassMethod codets(codename, ext)
}

}

0 comments on commit b84bfed

Please sign in to comment.