[Dive4elements-commits] [PATCH 5 of 6] meta-data.xml: Access wst_ranges and provide range is info-element

Wald Commits scm-commit at wald.intevation.org
Tue Jan 29 10:47:06 CET 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1359390709 -3600
# Node ID 065a78d6500774a879b39053504c4239ac7e353e
# Parent  5741970e2c586d13224b569b4ff6f5b5bedfc78d
meta-data.xml: Access wst_ranges and provide range is info-element.

diff -r 5741970e2c58 -r 065a78d65007 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Mon Jan 28 17:16:00 2013 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Mon Jan 28 17:31:49 2013 +0100
@@ -6,8 +6,11 @@
         SELECT wst_columns.id          AS prot_column_id,
                wst_columns.name        AS prot_column_name,
                wst_columns.position    AS prot_rel_pos,
-               wst_columns.description AS info
-        FROM wst_columns WHERE wst_columns.wst_id = ${prot_id}
+               wst_columns.description AS info,
+               wst_ranges.a            AS deffrom,
+               wst_ranges.b            AS defto
+        FROM wst_columns, wst_ranges
+        WHERE wst_columns.wst_id = ${prot_id} AND wst_ranges.wst_column_id = wst_columns.id
         ORDER by wst_columns.position
     </dc:statement>
 </dc:macro>
@@ -40,7 +43,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="base_data-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -68,7 +71,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="base_data-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="wqinterpol"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -97,7 +100,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="additionalsmarks-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -126,7 +129,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="additionals-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -155,7 +158,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="additionals-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -184,7 +187,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="fixations-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="wqinterpol"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -212,7 +215,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="fixations-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="wqinterpol"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -240,7 +243,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="fixations-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="staticwkms"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -268,7 +271,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="fixations-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="staticwkms"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -297,7 +300,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="additionals-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwqkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -325,7 +328,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="heightmarks_points-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="staticwkms"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -353,7 +356,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="heightmarks_points-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="staticwkms"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -381,7 +384,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="heightmarks_annotations-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="wqinterpol"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>
@@ -413,7 +416,7 @@
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
                           <dc:attribute name="factory" value="staticwkms"/>
-                          <dc:attribute name="info" value="${info}"/>
+                          <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                         </column>
                       </dc:elements>
                     </dc:context>
@@ -445,7 +448,7 @@
                         <dc:attribute name="name" value="${prot_column_name}"/>
                         <dc:attribute name="ids" value="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
                         <dc:attribute name="factory" value="staticwkms"/>
-                        <dc:attribute name="info" value="${info}"/>
+                        <dc:attribute name="info" value="${info} [km ${deffrom} - ${defto}]"/>
                       </column>
                     </dc:elements>
                   </dc:context>


More information about the Dive4elements-commits mailing list