Skip to content

Commit 6fbd24e

Browse files
committed
[FIX] xml extension bug
1 parent a115333 commit 6fbd24e

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

cls/sc/diff/gitLocal.cls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ClassMethod buildDiff(repo As %String, sha1 As %String, sha2 As %String, Output
2727
set status = $e($piece(element, $c(9)))
2828
set file = $piece(element, $c(9), 2)
2929

30-
if ($l(file,"src/") '= 2) continue
30+
if ($l(file,"src/") < 2) continue
3131

3232
set isRelevantFile = ##class(sc.diff.utils).isRelevantFile(file)
3333
if ((element="") || ('isRelevantFile)) continue
@@ -42,7 +42,7 @@ ClassMethod buildDiff(repo As %String, sha1 As %String, sha2 As %String, Output
4242
}elseif $length(element, $c(9))=3
4343
{
4444
set file = $piece(element, $c(9), 3)
45-
if ($l(file,"src/") '= 2) continue
45+
if ($l(file,"src/") < 2) continue
4646
if ((status="C") || (status="R"))
4747
{
4848
do ##class(sc.diff.utils).ToCacheName(.newFile)

cls/sc/diff/utils.cls

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ Class sc.diff.utils
33

44
Parameter TRACKEDEXT As List = {$lb("xml", "cls", "csp", "csr", "mac", "int", "bas", "inc", "gbl", "prj", "obj", "pkg", "gof", "dfi", "pivot", "dashboard")};
55

6-
ClassMethod ToCacheName(ByRef FileName)
6+
ClassMethod ToCacheName(ByRef filename)
77
{
8-
set:$L(FileName,".xml")'=1 FileName = $extract(FileName,1,*-4)
9-
set str = $Select($L(FileName,"cls/")>1:$Replace($P(FileName,"cls/",2),"/","."),
10-
$L(FileName,"csp/")>1:$Replace($P(FileName,"csp/",2),"/","."),
11-
$L(FileName,"dfi/")>1:$Replace($P(FileName,"dfi/",2),"/","-"),
12-
$L(FileName,"inc/")>1:$Replace($P(FileName,"inc/",2),"/","."),
13-
$L(FileName,"web/")>1:$Replace($P(FileName,"web/",2),"/","."),
14-
1:$Replace(FileName,"/",".")
8+
do:$L(filename,".xml")>1 ..getExtension(.filename)
9+
set str = $Select(
10+
$L(filename,"cls/")>1:$Replace($P(filename,"cls/",2),"/","."),
11+
$L(filename,"csp/")>1:$Replace($P(filename,"csp/",2),"/","."),
12+
$L(filename,"dfi/")>1:$Replace($P(filename,"dfi/",2),"/","-"),
13+
$L(filename,"inc/")>1:$Replace($P(filename,"inc/",2),"/","."),
14+
$L(filename,"web/")>1:$Replace($P(filename,"web/",2),"/","."),
15+
1:$Replace(filename,"/",".")
1516
)
16-
set FileName = $P(str,".",1,*-1)_"."_ $ZCVT($P(str,".",*),"U")
17+
set filename = $P(str,".",1,*-1)_"."_ $ZCVT($P(str,".",*),"U")
1718
}
1819

1920
ClassMethod isRelevantFile(file As %String) As %Boolean
@@ -22,5 +23,14 @@ ClassMethod isRelevantFile(file As %String) As %Boolean
2223
quit $lf(..#TRACKEDEXT, ext)>0
2324
}
2425

26+
ClassMethod getExtension(ByRef filename)
27+
{
28+
if ($L(filename,"dfi/") > 1) {
29+
set filename = $extract(filename,1,*-4)_".DFI"
30+
}elseif ($L(filename,"cls/") > 1) {
31+
set filename = $extract(filename,1,*-4)_".CLS"
32+
}
33+
}
34+
2535
}
2636

0 commit comments

Comments
 (0)