[PATCH] Fixed the queries for the loadable tkh, flow depth and depth evolution data

Wald Commits scm-commit at wald.intevation.org
Mon May 7 07:57:16 CEST 2018


# HG changeset patch
# User mschaefer
# Date 1525672602 -7200
# Node ID c49b95820d602ef9bf3cac5da92863827c0214d6
# Parent  d3bef221b7d924e38be9adaf48933cda49a77b2f
Fixed the queries for the loadable tkh, flow depth and depth evolution data

diff -r d3bef221b7d9 -r c49b95820d60 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri May 04 16:13:10 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon May 07 07:56:42 2018 +0200
@@ -3492,7 +3492,7 @@
     <dc:macro name="sinfo_predefined_tkh">
       <dc:context>
         <dc:statement>
-          SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, sc.name AS tkh_col_name,
+          SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, MIN(sc.name) AS tkh_col_name,
             MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
             MIN(s.filename) || '<br />'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />'
@@ -3535,8 +3535,8 @@
     <dc:macro name="sinfo_predefined_depthevol">
       <dc:context>
         <dc:statement>
-          SELECT s.id AS depthevol_id, s.filename AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
-            s.filename || '<br />'
+          SELECT s.id AS depthevol_id, MIN(s.filename) AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
+            MIN(s.filename) || '<br />'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />'
             || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />'
             || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />'
@@ -3561,7 +3561,7 @@
     <dc:macro name="sinfo_predefined_flowdepth-m1">
       <dc:context>
         <dc:statement>
-          SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, sc.name AS flowdepth_col_name,
+          SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, MIN(sc.name) AS flowdepth_col_name,
             MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
             MIN(s.filename) || '<br />'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />'


More information about the Dive4Elements-commits mailing list