diff gnv-artifacts/doc/conf/queries.properties @ 211:310874d3573f

Minimum and Maximum Depth should be entered by the User issue31 gnv-artifacts/trunk@267 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Mon, 26 Oct 2009 15:51:36 +0000
parents d5cef9f17525
children c0a798299efc
line wrap: on
line diff
--- a/gnv-artifacts/doc/conf/queries.properties	Fri Oct 23 14:29:50 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Oct 26 15:51:36 2009 +0000
@@ -169,7 +169,17 @@
           m.MEASUREMENTID = tsv.MEASUREMENTID and \
           m.FEATUREID = ? \
     ORDER BY p.GERMANNAME
-
+    
+verticalprofile_minmaxdepth= SELECT min(M.ZLOCATION) MIN, \
+           max(M.ZLOCATION) MAX \
+    FROM MEDIAN.MEASUREMENT M, \
+         MEDIAN.TIMESERIES TS, \
+         MEDIAN.TIMESERIESVALUE TSV \
+    WHERE TS.TIMESERIESID = TSV.TIMESERIESID and \
+          M.MEASUREMENTID = TSV.MEASUREMENTID and \
+          M.FEATUREID = ? and \
+          TS.PARAMETERID IN ( ? )
+          
 verticalprofile_date=select distinct \
            tsv.TIMEVALUE KEY, \
            tsv.TIMEVALUE VALUE \
@@ -182,23 +192,25 @@
           ts.PARAMETERID IN ( ? ) \
     order by tsv.TIMEVALUE 
 
-verticalprofile_chart_data= SELECT m.ZLOCATION XORDINATE, \
-           tsv.DATAVALUE YORDINATE, \
-           ts.PARAMETERID GROUP1, \
-           tsv.TIMEVALUE GROUP2, \
+verticalprofile_chart_data= SELECT M.ZLOCATION XORDINATE, \
+           TSV.DATAVALUE YORDINATE, \
+           TS.PARAMETERID GROUP1, \
+           TSV.TIMEVALUE GROUP2, \
            1 GROUP3 \
-    from MEDIAN.TIMESERIES ts, \
-         MEDIAN.TIMESERIESVALUE tsv, \
-         MEDIAN.MEASUREMENT m \
-    where ts.TIMESERIESID = tsv.TIMESERIESID and \
-          m.MEASUREMENTID = tsv.MEASUREMENTID and \
-          m.FEATUREID = ? and \
-          ts.PARAMETERID IN ( ? ) AND \
-          tsv.TIMEVALUE IN (?) \
-    ORDER BY tsv.TIMEVALUE , \
-             tsv.TIMESERIESID , \
-             ts.PARAMETERID , \
-             tsv.TIMEVALUE
+    from MEDIAN.TIMESERIES TS, \
+         MEDIAN.TIMESERIESVALUE TSV, \
+         MEDIAN.MEASUREMENT M \
+    where TS.TIMESERIESID = TSV.TIMESERIESID AND \
+          M.MEASUREMENTID = TSV.MEASUREMENTID AND \
+          M.FEATUREID = ? AND \
+          TS.PARAMETERID IN ( ? ) AND \
+          TSV.TIMEVALUE IN (?) AND \
+          M.ZLOCATION >= ? AND \
+          M.ZLOCATION <= ? \
+    ORDER BY TSV.TIMEVALUE , \
+             TSV.TIMESERIESID , \
+             TS.PARAMETERID , \
+             TSV.TIMEVALUE
              
 #############################################
 #############################################
@@ -318,7 +330,17 @@
           MSV.PARAMETERID = P.PARAMETERID AND \
           IP.FEATUREID = ? \
     ORDER BY P.GERMANNAME
-
+    
+verticalprofile_instantaneouspoint_minmaxdepth = SELECT min(M.ZLOCATION) MIN, \
+        max(M.ZLOCATION) MAX  \
+    FROM MEDIAN.INSTANTANEOUSPOINT IP, \
+         MEDIAN.MEASUREMENT M, \
+         MEDIAN.MEASUREDSCALARVALUE MSV \
+    WHERE IP.FEATUREID = M.FEATUREID AND \
+          M.MEASUREMENTID = MSV.MEASUREMENTID AND \
+          IP.FEATUREID = ? AND \
+          MSV.PARAMETERID in (?)
+          
 verticalprofile_instantaneouspoint_chart_data = SELECT M.ZLOCATION XORDINATE, \
         MSV.DATAVALUE  YORDINATE, \
         MSV.PARAMETERID GROUP1, \
@@ -330,7 +352,9 @@
     WHERE IP.FEATUREID = M.FEATUREID AND \
           M.MEASUREMENTID = MSV.MEASUREMENTID AND \
           IP.FEATUREID = ? AND \
-          MSV.PARAMETERID in (?) \
+          MSV.PARAMETERID in (?) AND \
+          M.ZLOCATION >= ? AND \
+          M.ZLOCATION <= ? \
     ORDER BY IP.TIMEVALUE, \
           MSV.PARAMETERID, \
           M.ZLOCATION

http://dive4elements.wald.intevation.org