Skip to content

Commit a7566e1

Browse files
Rob TjalmaRob Tjalma
authored andcommitted
Added Filename items to list calls
Signed-off-by: Rob Tjalma <[email protected]>
1 parent 0e59899 commit a7566e1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

repository-basex/src/main/java/org/lfenergy/compas/scl/data/repository/CompasSclDataBaseXRepository.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ public List<Item> list(SclType type) {
7777
format(DECLARE_DB_VARIABLE, type) +
7878
"for $resource in db:open($db)\n" +
7979
" let $id := $resource/scl:SCL/scl:Header/@id\n" +
80+
" let $filename := $resource/scl:SCL/scl:Private[@type='compas_scl']/*:SclFilename\n" +
8081
" group by $id\n" +
81-
" return '<Item><Id>' || $id || '</Id><Version>' || local:latest-version($db, $id)//scl:SCL/scl:Header/@version || '</Version></Item>'",
82+
" return '<Item><Id>' || $id || '</Id><Filename>' || $filename || '</Filename><Version>' || local:latest-version($db, $id)//scl:SCL/scl:Header/@version || '</Version></Item>'",
8283
sclDataMarshaller::unmarshal
8384
);
8485
}
@@ -90,13 +91,14 @@ public List<Item> listVersionsByUUID(SclType type, UUID id) {
9091
format(DECLARE_ID_VARIABLE, id) +
9192
"for $resource in db:open($db, $id)\n" +
9293
" let $id := $resource/scl:SCL/scl:Header/@id\n" +
94+
" let $filename := $resource/scl:SCL/scl:Private[@type='compas_scl']/*:SclFilename\n" +
9395
" let $version := $resource/scl:SCL/scl:Header/@version\n" +
9496
" let $parts := tokenize($version, '\\.')\n" +
9597
" let $majorVersion := xs:int($parts[1])\n" +
9698
" let $minorVersion := xs:int($parts[2])\n" +
9799
" let $patchVersion := xs:int($parts[3])\n" +
98100
" order by $majorVersion, $minorVersion, $patchVersion\n" +
99-
" return '<Item><Id>' || $id || '</Id><Version>' || $version || '</Version></Item>' ",
101+
" return '<Item><Id>' || $id || '</Id><Filename>' || $filename || '</Filename><Version>' || $version || '</Version></Item>' ",
100102
sclDataMarshaller::unmarshal
101103
);
102104
}

0 commit comments

Comments
 (0)