# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1256283459 0
# Node ID 01ac348ac4a4e0985e95aa87ecea9305a83ffa2c
# Parent  6e7952fd1744e11b236355bb0697ab2e5b1a633d
Optimized Query horizontalprofile_instantaneouspoint_cruise because it is not warranted
that the name of an cruise is set. issue60

gnv-artifacts/trunk@262 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6e7952fd1744 -r 01ac348ac4a4 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Thu Oct 22 14:02:30 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Oct 23 07:37:39 2009 +0000
@@ -1,3 +1,9 @@
+2009-10-23  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/queries.properties: 
+	  Optimized Query horizontalprofile_instantaneouspoint_cruise because it is not warranted
+	  that the name of an cruise is set. issue60
+
 2009-10-22  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/java/de/intevation/gnv/transition/CoordinateSelectionTransition.java (extractKVP): 
diff -r 6e7952fd1744 -r 01ac348ac4a4 gnv-artifacts/doc/conf/queries.properties
--- a/gnv-artifacts/doc/conf/queries.properties	Thu Oct 22 14:02:30 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Fri Oct 23 07:37:39 2009 +0000
@@ -379,19 +379,26 @@
     ORDER BY V.NAME
 horizontalprofile_instantaneouspoint_cruise = SELECT DISTINCT \
         C.CRUISEID KEY , \
-        C.NAME VALUE \
+        V.NAME || ' ' || \
+        C.NAME || ' ' || \
+        TO_CHAR(C.STARTDATE,'DD.MM.YYYY') || ' - ' || \
+        TO_CHAR(C.ENDDATE,'DD.MM.YYYY') VALUE , \
+        V.NAME , \
+        C.NAME \
      FROM MEDIAN.CRUISE C, \
+         MEDIAN.VEHICLE V, \
          MEDIAN.TRACK T, \
          MEDIAN.SURVEYINFO S, \
          MEDIAN.INSTANTANEOUSPOINT I, \
          MEDIAN.MEASUREMENT M \
-    WHERE C.CRUISEID = T.CRUISEID AND \
+    WHERE C.VEHICLEID = V.VEHICLEID AND \
+          C.CRUISEID = T.CRUISEID AND \
           T.TRACKID = S.TRACKID AND \
           S.SURVEYID  = I.SURVEYID AND \
           I.FEATUREID =  M.FEATUREID AND \
           C.VEHICLEID  = ? AND \
           M.SOURCEID = ? \
-    ORDER BY C.NAME
+    ORDER BY V.NAME, C.NAME
 horizontalprofile_instantaneouspoint_track= SELECT \
         T.TRACKID KEY , \
         to_char(T.STARTDATE,'DD.MM.YYYY HH24:MI') || ' - '|| to_char(T.ENDDATE,'DD.MM.YYYY HH24:MI') || ' - '|| T.NAME VALUE \