Skip to content

Commit a4ac00c

Browse files
committed
fix *.dfi export
1 parent 7af7e0b commit a4ac00c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

sc.all.cls

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0)
1313
#define export(%code, %file) $system.OBJ.ExportUDL(%code, %file,"/diffexport")
1414
#define isGenerated(%code) ##class(%RoutineMgr).IsGenerated( %code )
1515
#define isPercented(%code) ("%" = $e(%code))
16-
#define log w !, code, " -> ", filename
16+
#define log w !, code, " -> ", filename, " "
1717

1818
#; classes
1919
s rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
@@ -27,7 +27,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0)
2727
if ( 'percent && $$$isPercented( code ) ) continue
2828
s filename = ..filename( code )
2929
$$$log
30-
d $$$export( code, filename )
30+
w $$$export( code, filename )
3131

3232
} s rs=""
3333
}
@@ -42,7 +42,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0)
4242
if ( 'generated && $$$isGenerated( code ) ) continue
4343
s filename = ..filename( code )
4444
$$$log
45-
d $$$export( code, filename )
45+
w $$$export( code, filename )
4646

4747
} s rs=""
4848
}
@@ -55,7 +55,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0)
5555
while rs.%Next() {
5656
s code = rs.Name, filename = ..filename( code_".dfi" )
5757
$$$log
58-
d $$$export( code, filename )
58+
w $$$export( code, filename )
5959

6060
} s rs=""
6161

@@ -111,7 +111,11 @@ ClassMethod filename(code)
111111
{
112112
s wd = ..workdir()
113113
d:'##class(%File).DirectoryExists( wd ) ##class(%File).CreateDirectoryChain( wd )
114-
Q ##class(%File).NormalizeFilename( code, wd )
114+
s filename = ##class(%File).NormalizeFilename( code, wd )
115+
#; for *.dfi filename can contain folders
116+
s path = ##class(%File).GetDirectory(filename)
117+
d:'##class(%File).DirectoryExists( path ) ##class(%File).CreateDirectoryChain( path )
118+
Q filename
115119
}
116120

117121
/// get or set working directory for export/import source

sc.all.sub.cls

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ ClassMethod filename(code)
99
#; for each type - different directory
1010
s wd = ..workdir() s:ext'="" wd = ##class(%File).NormalizeDirectory( ext, wd )
1111
d:'##class(%File).DirectoryExists( wd ) ##class(%File).CreateDirectoryChain( wd )
12-
s path = ##class(%File).NormalizeFilename( code, wd )
13-
Q path
12+
13+
s filename = ##class(%File).NormalizeFilename( code, wd )
14+
#; for *.dfi filename can contain folders
15+
if ext = "dfi" {
16+
s path = ##class(%File).GetDirectory( filename )
17+
d:'##class(%File).DirectoryExists( path ) ##class(%File).CreateDirectoryChain( path )
18+
}
19+
Q filename
1420
}
1521

1622
}

0 commit comments

Comments
 (0)