diff gnv-artifacts/src/test/ressources/queries.properties @ 120:5134266f00e7

Resolved gnv/issue21 No NPE will be thrown. Add Dummydata for Calculating the distance between two MeasurmentPoints. gnv-artifacts/trunk@190 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 06 Oct 2009 10:58:47 +0000
parents 4841808819d9
children 7be22e76c270
line wrap: on
line diff
--- a/gnv-artifacts/src/test/ressources/queries.properties	Mon Oct 05 10:15:15 2009 +0000
+++ b/gnv-artifacts/src/test/ressources/queries.properties	Tue Oct 06 10:58:47 2009 +0000
@@ -421,12 +421,12 @@
     WHERE M.FEATUREID = IP.FEATUREID AND \
           IP.SURVEYID = ? \
     ORDER BY M.ZLOCATION
-horizontalprofile_instantaneouspoint_chart_data = SELECT M.XLOCATION XORDINATE_XCOORD , \
-        M.YLOCATION XORDINATE_YCOORD , \
+horizontalprofile_instantaneouspoint_chart_data = SELECT MSV.OBJECTID XORDINATE_XCOORD , \
+        MSV.OBJECTID XORDINATE_YCOORD , \
         MSV.DATAVALUE  YORDINATE , \
         MSV.PARAMETERID GROUP1 , \
-        IP.TIMEVALUE GROUP2 , \
-        ZLOCATION GROUP3 \
+        ZLOCATION GROUP2 , \
+        1 GROUP3 \
     FROM MEDIAN.INSTANTANEOUSPOINT IP, \
          MEDIAN.MEASUREMENT M, \
          MEDIAN.MEASUREDSCALARVALUE MSV \
@@ -435,10 +435,9 @@
           IP.SURVEYID = ? AND \
           M.ZLOCATION IN (?) AND \
           MSV.PARAMETERID in (?) \
-    ORDER BY M.ZLOCATION, \
-          MSV.PARAMETERID, \
-          IP.TIMEVALUE
-          
+    ORDER BY MSV.PARAMETERID, \
+             M.ZLOCATION
+             
 #############################################
 #############################################
 ########### Horizontalprofil MESH ###########
@@ -492,5 +491,4 @@
             msv.PARAMETERID, \
             mp.JPOSITION , \
             mp.IPOSITION
-            
              
\ No newline at end of file

http://dive4elements.wald.intevation.org