Mercurial > dive4elements > river
changeset 6214:467df391317d
I999: Filter epochs ands single years in datacage config.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Thu, 06 Jun 2013 13:26:34 +0200 |
| parents | 450bf0017690 |
| children | 0f5cacdd60a9 |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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>