Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/test/ressources/queries.properties @ 119:4841808819d9
Added the new FIS
FIS GTS
FIS CTD
FIS XBT
to the Configuration.
This three FIS uses Data from InstantaneousPoint
Some CodeCleanup done
gnv-artifacts/trunk@182 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Mon, 05 Oct 2009 10:15:15 +0000 |
| parents | 820238357bab |
| children | 5134266f00e7 |
line wrap: on
line diff
--- a/gnv-artifacts/src/test/ressources/queries.properties Mon Oct 05 07:52:13 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/queries.properties Mon Oct 05 10:15:15 2009 +0000 @@ -295,15 +295,29 @@ ############################################# ############################################# -verticalprofile_instantaneouspoint_series = SELECT S.SERIESID KEY, \ +verticalprofile_instantaneouspoint_series = SELECT DISTINCT \ + S.SERIESID KEY , \ S.DESCRIPTION VALUE \ - FROM MEDIAN.SERIES S - -verticalprofile_instantaneouspoint_point = SELECT IP.FEATUREID KEY, \ - IP.SHAPE VALUE \ - FROM MEDIAN.INSTANTANEOUSPOINT IP \ - WHERE IP.POINTSPEC = 4 AND \ - IP.SERIESID = ? + FROM MEDIAN.SERIES S, \ + MEDIAN.INSTANTANEOUSPOINT I, \ + MEDIAN.MEASUREMENT M \ + WHERE S.SERIESID = I.SERIESID AND \ + I.POINTSPEC = 4 AND \ + I.FEATUREID = M.FEATUREID AND \ + M.SOURCEID= ? \ + ORDER BY S.DESCRIPTION + +verticalprofile_instantaneouspoint_point = SELECT DISTINCT \ + I.FEATUREID KEY, \ + to_char(I.TIMEVALUE,'DD.MM.YYYY HH24:MI') || ' - '|| I.SHAPE VALUE, \ + I.TIMEVALUE \ + FROM MEDIAN.INSTANTANEOUSPOINT I, \ + MEDIAN.MEASUREMENT M \ + WHERE I.SERIESID = ? AND \ + I.POINTSPEC = 4 AND \ + I.FEATUREID = M.FEATUREID AND \ + M.SOURCEID = ? \ + ORDER BY I.TIMEVALUE verticalprofile_instantaneouspoint_parameter = SELECT DISTINCT \ P.PARAMETERID KEY , \ @@ -412,7 +426,7 @@ MSV.DATAVALUE YORDINATE , \ MSV.PARAMETERID GROUP1 , \ IP.TIMEVALUE GROUP2 , \ - 1 GROUP3 \ + ZLOCATION GROUP3 \ FROM MEDIAN.INSTANTANEOUSPOINT IP, \ MEDIAN.MEASUREMENT M, \ MEDIAN.MEASUREDSCALARVALUE MSV \ @@ -421,9 +435,9 @@ IP.SURVEYID = ? AND \ M.ZLOCATION IN (?) AND \ MSV.PARAMETERID in (?) \ - ORDER BY IP.TIMEVALUE, \ + ORDER BY M.ZLOCATION, \ MSV.PARAMETERID, \ - M.ZLOCATION + IP.TIMEVALUE ############################################# ############################################# @@ -478,4 +492,5 @@ msv.PARAMETERID, \ mp.JPOSITION , \ mp.IPOSITION - \ No newline at end of file + + \ No newline at end of file