Mercurial > dive4elements > river
changeset 7420:daa04d2f42ed
meta-data.xml: More usage of collection-group-macro.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 23 Oct 2013 11:22:47 +0200 |
| parents | cae7c0625436 |
| children | fcf72e5777c0 |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Oct 23 11:28:25 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Oct 23 11:22:47 2013 +0200 @@ -776,7 +776,7 @@ (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location'))"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> + <dc:call-macro name="collection-group"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:choose> @@ -798,7 +798,7 @@ </dc:element> </dc:for-each> </waterlevels> - </dc:group> + </dc:call-macro> </waterlevels> </dc:if> </dc:filter> @@ -816,7 +816,7 @@ <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'"> <dc:if test="dc:has-result()"> <vollmer_waterlevels> - <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> + <dc:call-macro name="collection-group"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:choose> @@ -838,7 +838,7 @@ </dc:element> </dc:for-each> </waterlevels> - </dc:group> + </dc:call-macro> </vollmer_waterlevels> </dc:if> </dc:filter> @@ -846,7 +846,7 @@ (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))"> <dc:if test="dc:has-result()"> <waterlevels> - <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> + <dc:call-macro name="collection-group"> <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:choose> @@ -868,7 +868,7 @@ </dc:element> </dc:for-each> </waterlevels> - </dc:group> + </dc:call-macro> </waterlevels> </dc:if> </dc:filter> @@ -899,7 +899,7 @@ $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer')"> <dc:if test="dc:has-result()"> <bed_quality_bed> - <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> + <dc:call-macro name="collection-group"> <quality-bed description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> @@ -912,7 +912,7 @@ </dc:element> </dc:for-each> </quality-bed> - </dc:group> + </dc:call-macro> </bed_quality_bed> </dc:if> </dc:filter>