# HG changeset patch
# User mschaefer
# Date 1528703735 -7200
# Node ID 7879c2ca8bd3a46184de260994fc1212853e4b87
# Parent  3c3608283ebaf95e3c86c96da7423397ac1239b4
Fixed three queries (channel, infrastructure, collision) by removing the trailing semicolon (produces oracle errors)

diff -r 3c3608283eba -r 7879c2ca8bd3 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Jun 08 17:56:50 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon Jun 11 09:55:35 2018 +0200
@@ -3396,12 +3396,12 @@
           MIN(s.filename) || '<br />'
           || MIN(s.kmrange_info) || ']<br />'
           || MIN(s.year_from) || ' - ' || MIN(s.year_to) || '<br />' AS info
-          FROM channel s INNER JOIN channel_values v ON s.id=v.channel_id
+          FROM channel s
+          INNER JOIN channel_values v ON s.id=v.channel_id
           WHERE (s.river_id=${river_id})
-          AND (v.station BETWEEN
-          ${fromkm}-0.0001 AND ${tokm}+0.0001)
+          AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
           GROUP BY s.id
-          ORDER BY MIN(s.year_to) DESC;
+          ORDER BY MIN(s.year_to) DESC
         </dc:statement>
         <dc:if test="dc:has-result()">
           <dc:for-each>
@@ -3435,9 +3435,9 @@
           || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.sounding_info) || '&lt;br /&gt;'
           || MIN(s.evaluation_by) AS info
-          FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id
-          INNER JOIN tkh_values
-          v ON sc.id=v.tkh_column_id
+          FROM tkh_column sc
+          INNER JOIN tkh s ON sc.tkh_id=s.id
+          INNER JOIN tkh_values v ON sc.id=v.tkh_column_id
           WHERE (s.river_id=${river_id})
           AND (lower(s.groupname)=${tkh_groupname})
           AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
@@ -3481,7 +3481,8 @@
           || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
           || MIN(s.old_glw) || ' - ' ||
           MIN(s.curr_glw) AS info
-          FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
+          FROM depth_evolution s
+          INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
           WHERE (s.river_id=${river_id})
           AND (lower(s.groupname)=${depthevol_groupname})
           AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
@@ -3508,8 +3509,8 @@
           || MIN(s.kmrange_info) || ']&lt;br /&gt;'
           || MIN(s.sounding_info) || '&lt;br /&gt;'
           || MIN(s.evaluation_by) AS info
-          FROM flow_depth_column sc INNER JOIN
-          flow_depth s ON sc.flow_depth_id=s.id
+          FROM flow_depth_column sc
+          INNER JOIN flow_depth s ON sc.flow_depth_id=s.id
           INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id
           WHERE (s.river_id=${river_id})
           AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
@@ -3537,13 +3538,14 @@
           MIN(s.filename) || '&lt;br /&gt;'
           || MIN(s.kmrange_info) || '&lt;br /&gt;'
           || MIN(s.year) || '&lt;br /&gt;' AS info
-          FROM infrastructure s INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id
+          FROM infrastructure s
+          INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id
           INNER JOIN annotation_types x ON
           s.annotation_type_id=x.id
           WHERE (s.river_id=${river_id})
           AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
           GROUP BY s.id
-          ORDER BY MIN(s.filename) DESC;
+          ORDER BY MIN(s.filename) DESC
         </dc:statement>
         <dc:if test="dc:has-result()">
           <dc:for-each>
@@ -3561,12 +3563,12 @@
           MIN(s.filename) || '&lt;br /&gt;'
           || MIN(s.kmrange_info) || '&lt;br /&gt;'
           || MIN(s.year) || '&lt;br /&gt;' AS info
-          FROM collision s INNER JOIN collision_values v ON s.id=v.collision_id
+          FROM collision s
+          INNER JOIN collision_values v ON s.id=v.collision_id
           WHERE (s.river_id=${river_id})
-          AND (v.station BETWEEN ${fromkm}-0.0001 AND
-          ${tokm}+0.0001)
+          AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
           GROUP BY s.id
-          ORDER BY MIN(s.year) ASC;
+          ORDER BY MIN(s.year)
         </dc:statement>
         <dc:if test="dc:has-result()">
           <dc:for-each>