diff artifacts/doc/conf/meta-data.xml @ 9059:c49b95820d60

Fixed the queries for the loadable tkh, flow depth and depth evolution data
author mschaefer
date Mon, 07 May 2018 07:56:42 +0200
parents c16e90a0baf7
children 89c1bb914f4e
line wrap: on
line diff
--- 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) || '&lt;br /&gt;'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
@@ -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 || '&lt;br /&gt;'
+          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) || '&lt;br /&gt;'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
             || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;'
             || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
@@ -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) || '&lt;br /&gt;'
             || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'

http://dive4elements.wald.intevation.org