Mercurial > dive4elements > gnv-client

diff gnv-artifacts/doc/conf/queries.properties @ 765:f28a7eac542a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Integrated valid ODV-Export to the GNV-Artifacts gnv-artifacts/trunk@821 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 23 Mar 2010 14:09:03 +0000
parents b3f922908a31
children cee3a0c22bb1
line wrap: on
line diff
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Mar 22 12:54:04 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Tue Mar 23 14:09:03 2010 +0000
@@ -105,7 +105,8 @@
             TSV.DATAVALUE, \
             TS.PARAMETERID PARAMETER, \
             TSV.MEASUREMENTID, \
-            TSV.TIMESERIESID \
+            TSV.TIMESERIESID, \
+            '1' QF \
      FROM MEDIAN.TIMESERIESPOINT, \
           MEDIAN.TIMESERIESVALUE TSV, \
           MEDIAN.TIMESERIES TS, \
@@ -119,10 +120,11 @@
            TSV.MEASUREMENTID IN ( ? ) AND \
            TSV.TIMEVALUE >= ? AND \
            TSV.TIMEVALUE <= ? \
-     ORDER BY TSV.MEASUREMENTID, \
+     ORDER BY TS.PARAMETERID, \
+              TSV.MEASUREMENTID, \
               TSV.TIMESERIESID, \
-              TS.PARAMETERID, \
               TSV.TIMEVALUE
+              
 
 #############################################
 #############################################
@@ -211,7 +213,8 @@
         (((ML.UPPERZLOCATION + ML.LOWERZLOCATION) / 2)*-1) DEPTH, \
         msv.TIMEVALUE, \
         msv.DATAVALUE, \
-        msv.PARAMETERID PARAMETER \
+        msv.PARAMETERID PARAMETER, \
+        '1' QF \
     from MEDIAN.MESHSCALARVALUE msv, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -230,8 +233,8 @@
           msv.TIMEVALUE <= ? \
     order by MEDIAN.MESHPOINT.FEATUREID, \
              msv.FEATUREID, \
-             msv.PARAMETERID, \
-             msv.TIMEVALUE
+             msv.TIMEVALUE, \
+             msv.PARAMETERID
 
 
 #############################################
@@ -332,7 +335,8 @@
             TSV.DATAVALUE, \
             TS.PARAMETERID PARAMETER, \
             TSV.MEASUREMENTID, \
-            TSV.TIMESERIESID \
+            TSV.TIMESERIESID, \
+            '1' QF \
      FROM MEDIAN.TIMESERIESPOINT, \
           MEDIAN.TIMESERIESVALUE TSV, \
           MEDIAN.TIMESERIES TS, \
@@ -349,8 +353,9 @@
            M.ZLOCATION <= ? \
      ORDER BY TSV.MEASUREMENTID, \
               TSV.TIMESERIESID, \
-              TS.PARAMETERID, \
-              TSV.TIMEVALUE
+              TSV.TIMEVALUE, \
+              TS.PARAMETERID
+              
              
 #############################################
 #############################################
@@ -504,7 +509,8 @@
         (((ML.UPPERZLOCATION + ML.LOWERZLOCATION) / 2)*-1) DEPTH, \
         msv.DATAVALUE, \
         msv.PARAMETERID PARAMETER, \
-        msv.TIMEVALUE \
+        msv.TIMEVALUE , \
+        '1' QF \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -530,9 +536,9 @@
                                   JPOSITION = (select JPOSITION from MEDIAN.MESHPOINT where FEATUREID = ?)) AND \
           MEDIAN.MESHPOINT.KPOSITION <= ? AND \
           MEDIAN.MESHPOINT.KPOSITION >= ? \
-    order by msv.PARAMETERID, \
-             msv.TIMEVALUE, \
-             ml.UPPERZLOCATION
+    order by msv.TIMEVALUE, \
+             ml.UPPERZLOCATION, \
+             msv.PARAMETERID
             
 #############################################
 #############################################
@@ -637,7 +643,8 @@
         (M.ZLOCATION * -1) DEPTH, \
         MSV.DATAVALUE, \
         MSV.PARAMETERID PARAMETER, \
-        MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE \
+        MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE , \
+        '1' QF \
     FROM MEDIAN.SERIES S, \
          MEDIAN.INSTANTANEOUSPOINT, \
          MEDIAN.MEASUREMENT M, \
@@ -650,8 +657,8 @@
           M.ZLOCATION >= ? AND \
           M.ZLOCATION <= ? \
     ORDER BY MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE, \
-          MSV.PARAMETERID, \
-          M.ZLOCATION
+          M.ZLOCATION, \
+          MSV.PARAMETERID
           
 #############################################
 #############################################
@@ -884,7 +891,8 @@
         ST_ASTEXT(SHAPE), \
         MEDIAN.INSTANTANEOUSPOINT.TIMEVALUE, \
         MSV.DATAVALUE, \
-        MSV.PARAMETERID PARAMETER \
+        MSV.PARAMETERID PARAMETER , \
+        '1' QF \
     FROM MEDIAN.INSTANTANEOUSPOINT, \
          MEDIAN.VEHICLE V, \
          MEDIAN.CRUISE C, \
@@ -973,7 +981,8 @@
           msv.PARAMETERID PARAMETER, \
           msv.TIMEVALUE, \
           MEDIAN.MESHPOINT.JPOSITION, \
-          MEDIAN.MESHPOINT.IPOSITION \
+          MEDIAN.MESHPOINT.IPOSITION , \
+          '1' QF \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -999,9 +1008,9 @@
                     ? = (select ? from MEDIAN.MESHPOINT where FEATUREID = ?)) \
    order by msv.TIMEVALUE, \
             MEDIAN.MESHPOINT.KPOSITION, \
-            msv.PARAMETERID, \
             MEDIAN.MESHPOINT.JPOSITION, \
-            MEDIAN.MESHPOINT.IPOSITION
+            MEDIAN.MESHPOINT.IPOSITION, \
+            msv.PARAMETERID
             
 #############################################
 #############################################
@@ -1136,7 +1145,8 @@
            MEDIAN.MESHPOINT.JPOSITION, \
            MEDIAN.MESHPOINT.IPOSITION, \
            MEDIAN.MESHPOINT.KPOSITION, \
-           2 DATAID \
+           2 DATAID , \
+           '1' QF \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -1160,10 +1170,10 @@
                     mp.MESHID = m.MESHID  AND \
                     ? = (select ? from MEDIAN.MESHPOINT where FEATUREID = ?)) \
     order by msv.TIMEVALUE, \
-             msv.PARAMETERID, \
              MEDIAN.MESHPOINT.JPOSITION, \
              MEDIAN.MESHPOINT.IPOSITION, \
-             MEDIAN.MESHPOINT.KPOSITION
+             MEDIAN.MESHPOINT.KPOSITION, \
+             msv.PARAMETERID
              
 #############################################
 #############################################
@@ -1256,7 +1266,8 @@
           M.OBJECTID = ? AND \
           MEDIAN.MESHPOINT.KPOSITION = ? \
     order by MEDIAN.MESHPOINT.JPOSITION, \
-             MEDIAN.MESHPOINT.IPOSITION
+             MEDIAN.MESHPOINT.IPOSITION, \
+             MSV.PARAMETERID
              
 area_filter = SELECT DISTINCT \
        FEATUREID KEY ,\
http://dive4elements.wald.intevation.org