changeset 336:1b9ca0f2d498

Added marker for different data sources in sql queries. gnv-artifacts/trunk@402 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 08 Dec 2009 11:18:27 +0000
parents e964a3d8f7bc
children a887074460b6
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/queries.properties
diffstat 2 files changed, 20 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Tue Dec 08 08:39:03 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Dec 08 11:18:27 2009 +0000
@@ -1,3 +1,8 @@
+2009-12-08  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* doc/conf/queries.properties: Added marker ('DATAID') for different data
+	  sources.
+
 2009-12-08  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/products/*.xml: 
--- a/gnv-artifacts/doc/conf/queries.properties	Tue Dec 08 08:39:03 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Tue Dec 08 11:18:27 2009 +0000
@@ -274,7 +274,8 @@
            TSV.DATAVALUE YORDINATE, \
            TS.PARAMETERID GROUP1, \
            TSV.TIMEVALUE GROUP2, \
-           1 GROUP3 \
+           1 GROUP3, \
+           1 DATAID \
     from MEDIAN.TIMESERIES TS, \
          MEDIAN.TIMESERIESVALUE TSV, \
          MEDIAN.MEASUREMENT M \
@@ -409,7 +410,8 @@
            msv.DATAVALUE YORDINATE, \
            msv.PARAMETERID GROUP1, \
            msv.TIMEVALUE GROUP2, \
-           1 GROUP3 \
+           1 GROUP3, \
+           2 DATAID \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT mp, \
          MEDIAN.MESH m, \
@@ -552,7 +554,8 @@
         MSV.DATAVALUE  YORDINATE, \
         MSV.PARAMETERID GROUP1, \
         IP.TIMEVALUE GROUP2, \
-        1 GROUP3 \
+        1 GROUP3, \
+        3 DATAID \
     FROM MEDIAN.INSTANTANEOUSPOINT IP, \
          MEDIAN.MEASUREMENT M, \
          MEDIAN.MEASUREDSCALARVALUE MSV \
@@ -742,7 +745,8 @@
         MSV.DATAVALUE  YORDINATE, \
         MSV.PARAMETERID GROUP1, \
         ZLOCATION GROUP2, \
-        1 GROUP3 \
+        1 GROUP3, \
+        3 DATAID \
     FROM MEDIAN.INSTANTANEOUSPOINT, \
          MEDIAN.MEASUREMENT M, \
          MEDIAN.MEASUREDSCALARVALUE MSV \
@@ -811,7 +815,8 @@
            MEDIAN.MESHPOINT.KPOSITION GROUP2, \
            msv.TIMEVALUE GROUP3, \
            MEDIAN.MESHPOINT.JPOSITION, \
-           MEDIAN.MESHPOINT.IPOSITION \
+           MEDIAN.MESHPOINT.IPOSITION, \
+           2 DATAID \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -939,7 +944,8 @@
            MSV.PARAMETERID PARAMETER, \
            MEDIAN.MESHPOINT.JPOSITION, \
            MEDIAN.MESHPOINT.IPOSITION, \
-           MEDIAN.MESHPOINT.KPOSITION \
+           MEDIAN.MESHPOINT.KPOSITION, \
+           2 DATAID \
     from MEDIAN.MESHLAYER ml, \
          MEDIAN.MESHPOINT, \
          MEDIAN.MESH m, \
@@ -999,7 +1005,8 @@
            MSV.DATAVALUE YORDINATE, \
            MEDIAN.MESHFACE.JPOSITION, \
            MEDIAN.MESHFACE.IPOSITION, \
-           MEDIAN.MESHFACE.KPOSITION \
+           MEDIAN.MESHFACE.KPOSITION, \
+           2 DATAID \
     from MEDIAN.MESHLAYER ML, \
          MEDIAN.MESHFACE, \
          MEDIAN.MESH M, \
@@ -1061,4 +1068,4 @@
     FROM MEDIAN.FEATUREAREA \
     WHERE (FEATURETYPE = 7 OR FEATURETYPE = 8) AND \
           FEATUREID = ? \
-    ORDER BY NAME
\ No newline at end of file
+    ORDER BY NAME

http://dive4elements.wald.intevation.org