Mercurial > dive4elements > gnv-client

changeset 524:d5a7608a4eea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Splitted data selection into two parts. Removed option to disable/enable data points in charts and exports. gnv-artifacts/trunk@618 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 25 Jan 2010 11:40:05 +0000
parents c6249cb631df
children 0eba2f032e0d
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/queries.properties
diffstat 3 files changed, 42 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Mon Jan 25 11:04:52 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Jan 25 11:40:05 2010 +0000
@@ -1,3 +1,11 @@
+2010-01-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* doc/conf/products/verticalcrosssection/conf_mesh.xml,
+	  doc/conf/queries.properties: Splitted date selection into two steps - year
+	  and concreate date in this year. Removed useless option to 
+	  disable/enable data points of chart and export output, because points 
+	  make no sense in such products.
+
 2010-01-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* doc/conf/products/horizontalprofile/conf_mesh_cross.xml,
--- a/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Mon Jan 25 11:04:52 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/verticalcrosssection/conf_mesh.xml	Mon Jan 25 11:40:05 2010 +0000
@@ -100,9 +100,29 @@
                   <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
              </inputvalues>
          </state>
+
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+              <from state="verticalcrosssection_mesh_parameter"/>
+              <to state="verticalcrosssection_mesh_year"/>
+         </transition>
+         
+         <state id="verticalcrosssection_mesh_year" description="verticalcrosssection_mesh_year" state="de.intevation.gnv.state.DefaultState">
+             <queryID>verticalcrosssection_mesh_year</queryID>
+             <dataname>yearid</dataname>
+             <data-multiselect>false</data-multiselect>
+             <inputvalues>
+                 <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+                 <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
+                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="yearid" type="String" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
+             </inputvalues>
+         </state>
          
          <transition transition="de.intevation.gnv.transition.DefaultTransition">
-              <from state="verticalcrosssection_mesh_parameter"/>
+              <from state="verticalcrosssection_mesh_year"/>
               <to state="verticalcrosssection_mesh_date"/>
          </transition>
          
@@ -116,6 +136,7 @@
                  <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
                  <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
                  <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/>
                  <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/>
                  <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
              </inputvalues>
@@ -146,21 +167,18 @@
                      <parameters>
                          <inputvalue name="width" type="Integer" value="600"/>
                          <inputvalue name="height" type="Integer" value="400"/>
-                         <inputvalue name="points" type="Boolean" value="false"/>
                      </parameters>
                  </outputsMode>
                  <outputsMode name="pdf" description="PDF-Export der Daten" mime-type="application/pdf">
                     <parameters>
                         <inputvalue name="width" type="Integer" value="600"/>
                         <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
                     </parameters>
                 </outputsMode>
                  <outputsMode name="svg" description="SVG-Export der Daten" mime-type="image/svg+xml">
                     <parameters>
                         <inputvalue name="width" type="Integer" value="600"/>
                         <inputvalue name="height" type="Integer" value="400"/>
-                        <inputvalue name="points" type="Boolean" value="false"/>
                     </parameters>
                 </outputsMode>
                  <outputsMode name="csv" description="CSV-Export der Daten" mime-type="text/plain"/>
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Jan 25 11:04:52 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Jan 25 11:40:05 2010 +0000
@@ -984,6 +984,16 @@
 ############# Profilschnitt MESH ############
 #############################################
 #############################################
+verticalcrosssection_mesh_year = select  distinct \
+        to_char(msv.TIMEVALUE,'YYYY') KEY, \
+        to_char(msv.TIMEVALUE,'YYYY') VALUE \
+    from MEDIAN.MESHSCALARVALUE msv, \
+         MEDIAN.MESH m \
+    where m.OBJECTID = ?  AND \
+          msv.PARTID >= m.PARTIDMIN AND \
+          msv.PARTID <= m.PARTIDMAX AND \
+          msv.PARAMETERID = ? \
+    order by to_char(msv.TIMEVALUE,'YYYY')
 verticalcrosssection_mesh_date = select  distinct \
         msv.TIMEVALUE KEY, \
         msv.TIMEVALUE VALUE \
@@ -992,7 +1002,8 @@
     where m.OBJECTID = ?  AND \
           msv.PARTID >= m.PARTIDMIN AND \
           msv.PARTID <= m.PARTIDMAX AND \
-          msv.PARAMETERID = ? \
+          msv.PARAMETERID = ? AND \
+          to_char(msv.TIMEVALUE,'YYYY') in (?) \
     order by msv.TIMEVALUE
 verticalcrosssection_mesh_chart_data = SELECT ST_ASTEXT(SHAPE), \
            ((ml.UPPERZLOCATION  + ml.LOWERZLOCATION) / 2) Z, \
http://dive4elements.wald.intevation.org