[Dive4elements-commits] [PATCH 1 of 3] I999: Filter epochs ands single years in datacage config

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1370517994 -7200
# Node ID 467df391317de4044b84596563fd36379b6c3426
# Parent  450bf001769060d92b63bcdacd5be68c9711fa6d
I999: Filter epochs ands single years in datacage config.

diff -r 450bf0017690 -r 467df391317d artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Jun 06 11:20:20 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Jun 06 13:26:34 2013 +0200
@@ -246,12 +246,6 @@
                   </dc:when>
                   <dc:when test="$out = 'minfo-heights'">
                     <dc:call-macro name="minfo-heights"/>
-                    <dc:macro name="minfo-heights">
-                      <bedheights>
-                        <dc:call-macro name="bed-heights-single"/>
-                        <dc:call-macro name="bed-heights-epoch"/>
-                      </bedheights>
-                    </dc:macro>
                   </dc:when>
                   <dc:when test="$out = 'minfo-heights-epoch'">
                     <bedheights>
@@ -1210,7 +1204,9 @@
             SELECT id          AS bedh_id,
                    year        AS bedh_year,
                    description AS bedh_descr
-            FROM bed_height_single WHERE river_id = ${river_id}
+            FROM bed_height_single
+            WHERE river_id = ${river_id}
+              AND lower(description) NOT LIKE '%epoch%'
           </dc:statement>
           <dc:for-each>
             <height factory="bedheight" target_out="{$out}"
@@ -1225,14 +1221,16 @@
       <epoch>
         <dc:context>
           <dc:statement>
-            SELECT id               AS bedh_id,
-                   time_interval_id AS bedh_interval_id,
-                   description      AS bedh_descr
-            FROM bed_height_epoch WHERE river_id = ${river_id}
+            SELECT id          AS bedh_id,
+                   year        AS bedh_year,
+                   description AS bedh_descr
+            FROM bed_height_single
+            WHERE river_id = ${river_id}
+              AND lower(description) LIKE '%epoch%'
           </dc:statement>
           <dc:for-each>
             <height factory="bedheight" target_out="{$out}"
-                    ids="bedheight-epoch-{$bedh_id}-{$bedh_interval_id}"
+                    ids="bedheight-single-{$bedh_id}-{$bedh_year}"
                     description="{$bedh_descr}"/>
           </dc:for-each>
         </dc:context>