[PATCH] Previous fix for flys/issue1675 was broken. :-/

Wald Commits scm-commit at wald.intevation.org
Tue Nov 12 16:54:24 CET 2013


# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1384271658 -3600
# Node ID 783b295c35d3a6d731e94210be17377fbbf80974
# Parent  caac7320874552543a8b07cab3245da3a63c32e3
Previous fix for flys/issue1675 was broken. :-/

diff -r caac73208745 -r 783b295c35d3 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Tue Nov 12 15:37:38 2013 +0100
+++ b/artifacts/doc/conf/meta-data.xml	Tue Nov 12 16:54:18 2013 +0100
@@ -1615,17 +1615,23 @@
               dc:find-all(
                 '\d{4}',
                 dc:replace-all(
-                  concat($diffids, 'X0000'),
-                    '[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}', '')))"
+                  $diffids,
+                  '[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}', '')))"
             type="number"/>
+          <dc:if test="$year_from = dc:min-number('x')">
+              <dc:variable name="year_from" expr="0" type="number"/>
+          </dc:if>
           <dc:variable name="year_to" expr="
             dc:max-number(
               dc:find-all(
                 '\d{4}',
                 dc:replace-all(
-                  concat($diffids, 'X9999'),
-                    '[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}', '')))"
+                  $diffids,
+                  '[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}', '')))"
             type="number"/>
+          <dc:if test="$year_to = dc:max-number('x')">
+              <dc:variable name="year_to" expr="9999" type="number"/>
+          </dc:if>
         </dc:when>
         <dc:otherwise>
           <dc:comment>Just show everything</dc:comment>


More information about the Dive4elements-commits mailing list