[mapserver-commits] r9025 - in branches/branch-5-4: docs/ogc mapserver msautotest/wxs msautotest/wxs/expected

svn at osgeo.org svn at osgeo.org
Tue May 19 10:17:04 EDT 2009


Author: tomkralidis
Date: 2009-05-19 10:17:03 -0400 (Tue, 19 May 2009)
New Revision: 9025

Modified:
   branches/branch-5-4/docs/ogc/sos_server.txt
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapogcsos.c
   branches/branch-5-4/msautotest/wxs/expected/sos_cap.xml
   branches/branch-5-4/msautotest/wxs/expected/sos_cap0.xml
   branches/branch-5-4/msautotest/wxs/expected/sos_cap1.xml
   branches/branch-5-4/msautotest/wxs/expected/sos_caps_updatesequence.xml
   branches/branch-5-4/msautotest/wxs/expected/sos_se6.xml
   branches/branch-5-4/msautotest/wxs/sos.map
Log:
fix MIME type support (#3020)



Modified: branches/branch-5-4/docs/ogc/sos_server.txt
===================================================================
--- branches/branch-5-4/docs/ogc/sos_server.txt	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/docs/ogc/sos_server.txt	2009-05-19 14:17:03 UTC (rev 9025)
@@ -300,7 +300,7 @@
 ::
 
    http://127.0.0.1/cgi-bin/mapserv.exe?map=D:/ms4w/apps/sos/sos_test.map&Request=GetObservation&service=SOS&
-   Offering=WQ1289&observedproperty=Water Quality&version=1.0.0&responseFormat=text/xml; subtype=om/1.0.0  
+   Offering=WQ1289&observedproperty=Water Quality&version=1.0.0&responseFormat=text/xml; subtype="om/1.0.0"  
    
 Example 2:
 
@@ -309,7 +309,7 @@
    http://127.0.0.1/cgi-bin/mapserv.exe?map=D:/ms4w/apps/sos/sos_test.map&Request=GetObservation&service=SOS&
    Offering=WQ1289&observedproperty=Water Quality&eventtime=<ogc:TM_Equals><gml:TimePeriod><gml:beginPosition>1991-05-01</gml:beginPosition><gml:endPosition>1993-02-02</gml:endPosition></gml:TimePeriod></ogc:TM_Equals>  &result=<Filter><Or><PropertyIsEqualTo>
    <PropertyName>COLOUR</PropertyName><Literal>180</Literal></PropertyIsEqualTo><PropertyIsEqualTo>
-   <PropertyName>COLOUR</PropertyName><Literal>200</Literal></PropertyIsEqualTo></or></Filter>&version=1.0.0&responseFormat=text/xml; subtype=om/1.0.0
+   <PropertyName>COLOUR</PropertyName><Literal>200</Literal></PropertyIsEqualTo></or></Filter>&version=1.0.0&responseFormat=text/xml; subtype="om/1.0.0"
    
 Example 3:
 
@@ -318,14 +318,14 @@
    http://127.0.0.1/cgi-bin/mapserv.exe?map=D:/ms4w/apps/sos/sos_test.map&Request=GetObservation&service=SOS&
    Offering=WQ1289&observedproperty=Water Quality&featureofinterest=
    <gml:Envelope><gml:lowerCorner srsName='EPSG:4326'>-66 43</gml:lowerCorner><gml:upperCorner srsName='EPSG:4326'>
-   -64 45</gml:upperCorner></gml:Envelope>&version=1.0.0&responseFormat=text/xml; subtype=om/1.0.0
+   -64 45</gml:upperCorner></gml:Envelope>&version=1.0.0&responseFormat=text/xml; subtype="om/1.0.0"
 
 Example 4:
 
 ::
 
    http://127.0.0.1/cgi-bin/mapserv.exe?map=D:/ms4w/apps/sos/sos_test.map&Request=GetObservation&service=SOS&
-   Offering=WQ1289&observedproperty=Water Quality&version=1.0.0&responseFormat=text/xml; subtype=om/1.0.0&resultModel=om:Observation  
+   Offering=WQ1289&observedproperty=Water Quality&version=1.0.0&responseFormat=text/xml; subtype="om/1.0.0"&resultModel=om:Observation  
 
 DescribeSensor Request
 ######################
@@ -353,7 +353,7 @@
 ::
 
    http://127.0.0.1/cgi-bin/mapserv.exe?map=D:/ms4w/apps/sos/sos_test.map&Request=DescribeSensor&
-   procedure=urn:ogc:def:procedure:NS01EE0014&service=SOS&version=1.0.0&outputFormat=text/xml; subtype=sensorML/1.0.0
+   procedure=urn:ogc:def:procedure:NS01EE0014&service=SOS&version=1.0.0&outputFormat=text/xml; subtype="sensorML/1.0.0"
    
 Limitations / TODO
 ==================

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-19 14:17:03 UTC (rev 9025)
@@ -44,6 +44,8 @@
 
 - fix SOS blockSeparator output (#3014)
 
+- fix MIME type support (#3020)
+
 Version 5.4.0 (2009-04-22):
 ---------------------------
 

Modified: branches/branch-5-4/mapserver/mapogcsos.c
===================================================================
--- branches/branch-5-4/mapserver/mapogcsos.c	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/mapserver/mapogcsos.c	2009-05-19 14:17:03 UTC (rev 9025)
@@ -54,8 +54,8 @@
 const char *pszSOSNamespacePrefix        = "sos";
 const char *pszOMNamespaceUri            = "http://www.opengis.net/om/1.0";
 const char *pszOMNamespacePrefix         = "om";
-const char *pszSOSDescribeSensorMimeType = "text/xml; subtype=sensorML/1.0.0";
-const char *pszSOSGetObservationMimeType = "text/xml; subtype=om/1.0.0";
+const char *pszSOSDescribeSensorMimeType = "text/xml; subtype=\"sensorML/1.0.0\"";
+const char *pszSOSGetObservationMimeType = "text/xml; subtype=\"om/1.0.0\"";
 
 typedef struct {
   char *pszProcedure;

Modified: branches/branch-5-4/msautotest/wxs/expected/sos_cap.xml
===================================================================
--- branches/branch-5-4/msautotest/wxs/expected/sos_cap.xml	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/expected/sos_cap.xml	2009-05-19 14:17:03 UTC (rev 9025)
@@ -85,7 +85,7 @@
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=sensorML/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="sensorML/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
     </ows:Operation>
@@ -138,7 +138,7 @@
       </ows:Parameter>
       <ows:Parameter name="responseFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=om/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="om/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
       <ows:Parameter name="resultModel">
@@ -234,7 +234,7 @@
           </swe:CompositePhenomenon>
         </sos:observedProperty>
         <sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
-        <sos:responseFormat>text/xml; subtype=om/1.0.0</sos:responseFormat>
+        <sos:responseFormat>text/xml; subtype="om/1.0.0"</sos:responseFormat>
         <sos:resultModel>om:Observation</sos:resultModel>
         <sos:resultModel>om:Measurement</sos:resultModel>
         <sos:responseMode>inline</sos:responseMode>

Modified: branches/branch-5-4/msautotest/wxs/expected/sos_cap0.xml
===================================================================
--- branches/branch-5-4/msautotest/wxs/expected/sos_cap0.xml	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/expected/sos_cap0.xml	2009-05-19 14:17:03 UTC (rev 9025)
@@ -85,7 +85,7 @@
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=sensorML/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="sensorML/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
     </ows:Operation>
@@ -138,7 +138,7 @@
       </ows:Parameter>
       <ows:Parameter name="responseFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=om/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="om/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
       <ows:Parameter name="resultModel">
@@ -234,7 +234,7 @@
           </swe:CompositePhenomenon>
         </sos:observedProperty>
         <sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
-        <sos:responseFormat>text/xml; subtype=om/1.0.0</sos:responseFormat>
+        <sos:responseFormat>text/xml; subtype="om/1.0.0"</sos:responseFormat>
         <sos:resultModel>om:Observation</sos:resultModel>
         <sos:resultModel>om:Measurement</sos:resultModel>
         <sos:responseMode>inline</sos:responseMode>

Modified: branches/branch-5-4/msautotest/wxs/expected/sos_cap1.xml
===================================================================
--- branches/branch-5-4/msautotest/wxs/expected/sos_cap1.xml	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/expected/sos_cap1.xml	2009-05-19 14:17:03 UTC (rev 9025)
@@ -85,7 +85,7 @@
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=sensorML/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="sensorML/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
     </ows:Operation>
@@ -138,7 +138,7 @@
       </ows:Parameter>
       <ows:Parameter name="responseFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=om/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="om/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
       <ows:Parameter name="resultModel">
@@ -234,7 +234,7 @@
           </swe:CompositePhenomenon>
         </sos:observedProperty>
         <sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
-        <sos:responseFormat>text/xml; subtype=om/1.0.0</sos:responseFormat>
+        <sos:responseFormat>text/xml; subtype="om/1.0.0"</sos:responseFormat>
         <sos:resultModel>om:Observation</sos:resultModel>
         <sos:resultModel>om:Measurement</sos:resultModel>
         <sos:responseMode>inline</sos:responseMode>

Modified: branches/branch-5-4/msautotest/wxs/expected/sos_caps_updatesequence.xml
===================================================================
--- branches/branch-5-4/msautotest/wxs/expected/sos_caps_updatesequence.xml	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/expected/sos_caps_updatesequence.xml	2009-05-19 14:17:03 UTC (rev 9025)
@@ -85,7 +85,7 @@
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=sensorML/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="sensorML/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
     </ows:Operation>
@@ -138,7 +138,7 @@
       </ows:Parameter>
       <ows:Parameter name="responseFormat">
         <ows:AllowedValues>
-          <ows:Value>text/xml; subtype=om/1.0.0</ows:Value>
+          <ows:Value>text/xml; subtype="om/1.0.0"</ows:Value>
         </ows:AllowedValues>
       </ows:Parameter>
       <ows:Parameter name="resultModel">
@@ -234,7 +234,7 @@
           </swe:CompositePhenomenon>
         </sos:observedProperty>
         <sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
-        <sos:responseFormat>text/xml; subtype=om/1.0.0</sos:responseFormat>
+        <sos:responseFormat>text/xml; subtype="om/1.0.0"</sos:responseFormat>
         <sos:resultModel>om:Observation</sos:resultModel>
         <sos:resultModel>om:Measurement</sos:resultModel>
         <sos:responseMode>inline</sos:responseMode>

Modified: branches/branch-5-4/msautotest/wxs/expected/sos_se6.xml
===================================================================
--- branches/branch-5-4/msautotest/wxs/expected/sos_se6.xml	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/expected/sos_se6.xml	2009-05-19 14:17:03 UTC (rev 9025)
@@ -3,6 +3,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows/1.1" version="1.0.0" xml:lang="en-US" xsi:schemaLocation="http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd">
   <ows:Exception exceptionCode="InvalidParameterValue" locator="outputformat">
-    <ows:ExceptionText>msSOSDescribeSensor(): SOS server error. Invalid outputformat parameter XML.  Allowable values are: text/xml; subtype=sensorML/1.0.0</ows:ExceptionText>
+    <ows:ExceptionText>msSOSDescribeSensor(): SOS server error. Invalid outputformat parameter XML.  Allowable values are: text/xml; subtype="sensorML/1.0.0"</ows:ExceptionText>
   </ows:Exception>
 </ows:ExceptionReport>

Modified: branches/branch-5-4/msautotest/wxs/sos.map
===================================================================
--- branches/branch-5-4/msautotest/wxs/sos.map	2009-05-19 14:14:40 UTC (rev 9024)
+++ branches/branch-5-4/msautotest/wxs/sos.map	2009-05-19 14:17:03 UTC (rev 9025)
@@ -39,54 +39,54 @@
 # RUN_PARMS: sos_se4.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor" > [RESULT]
 # RUN_PARMS: sos_se5.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=2147" > [RESULT]
 # RUN_PARMS: sos_se6.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=2147&outputFormat=XML" > [RESULT]
-# RUN_PARMS: sos_se7.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=20147&outputFormat=text/xml; subtype=sensorML/1.0.0" > [RESULT]
+# RUN_PARMS: sos_se7.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=20147&outputFormat=text/xml; subtype=\"sensorML/1.0.0\"" > [RESULT]
 #
 #  Valid
 #
-# RUN_PARMS: sos_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=urn:ogc:def:procedure:35&outputFormat=text/xml; subtype=sensorML/1.0.0" > [RESULT]
+# RUN_PARMS: sos_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&procedure=urn:ogc:def:procedure:35&outputFormat=text/xml; subtype=\"sensorML/1.0.0\"" > [RESULT]
 #
 # GetObservation
 #
 # Exceptions
 #
 # GetObservation (Wrong DataBlock format)
-# RUN_PARMS: sos_se8.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality&resultModel=om:Notice" > [RESULT]
+# RUN_PARMS: sos_se8.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality&resultModel=om:Notice" > [RESULT]
 #
 # GetObservation (wrong observedProperty)
-# RUN_PARMS: sos_se9.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=AirQuality" > [RESULT]
+# RUN_PARMS: sos_se9.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=AirQuality" > [RESULT]
 #
 # GetObservation (invalid srsName)
-# RUN_PARMS: sos_se10.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality&srsName=EPSG:12345" > [RESULT]
+# RUN_PARMS: sos_se10.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality&srsName=EPSG:12345" > [RESULT]
 #
 # GetObservation (invalid procedure)
-# RUN_PARMS: sos_se11.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality&procedure=foo" > [RESULT]
+# RUN_PARMS: sos_se11.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality&procedure=foo" > [RESULT]
 #
 #  Valid
 #
 # GetObservation (all observations)
-# RUN_PARMS: sos_getobs_all.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality" > [RESULT]
+# RUN_PARMS: sos_getobs_all.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality" > [RESULT]
 #
 # GetObservation (DataBlock format)
-# RUN_PARMS: sos_getobs_datablock.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality&resultModel=om:Observation" > [RESULT]
+# RUN_PARMS: sos_getobs_datablock.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality&resultModel=om:Observation" > [RESULT]
 #
 # GetObservation (filter by procedure)
-# RUN_PARMS: sos_getobs_proc.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedProperty=WaterQuality&procedure=2147" > [RESULT]
+# RUN_PARMS: sos_getobs_proc.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedProperty=WaterQuality&procedure=2147" > [RESULT]
 #
 # GetObservation (filter by PropertyIsEqualTo)
-# RUN_PARMS: sos_getobs_filter.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsEqualTo><PropertyName>value</PropertyName><Literal>103.5</Literal></PropertyIsEqualTo></Filter>" > [RESULT]
+# RUN_PARMS: sos_getobs_filter.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsEqualTo><PropertyName>value</PropertyName><Literal>103.5</Literal></PropertyIsEqualTo></Filter>" > [RESULT]
 # 
 # GetObservation (eventTime)
-# RUN_PARMS: sos_getobs_time.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedproperty=WaterQuality&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>" > [RESULT]
+# RUN_PARMS: sos_getobs_time.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedproperty=WaterQuality&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>" > [RESULT]
 #
 # GetObservation (featureOfInterest)
-# RUN_PARMS: sos_getobs_foi.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedproperty=WaterQuality&featureOfInterest=<gml:Envelope><gml:lowerCorner srsName="EPSG:4326">-76 44</gml:lowerCorner><gml:upperCorner srsName="EPSG:4326">-64 47</gml:upperCorner></gml:Envelope>" > [RESULT]
+# RUN_PARMS: sos_getobs_foi.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedproperty=WaterQuality&featureOfInterest=<gml:Envelope><gml:lowerCorner srsName="EPSG:4326">-76 44</gml:lowerCorner><gml:upperCorner srsName="EPSG:4326">-64 47</gml:upperCorner></gml:Envelope>" > [RESULT]
 #
 # GetObservation (time and filter)
-# RUN_PARMS: sos_getobs_time_filter.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsGreaterThan><PropertyName>value</PropertyName><Literal>89.9</Literal></PropertyIsGreaterThan></Filter>&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>" > [RESULT]
+# RUN_PARMS: sos_getobs_time_filter.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsGreaterThan><PropertyName>value</PropertyName><Literal>89.9</Literal></PropertyIsGreaterThan></Filter>&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>" > [RESULT]
 # 
 # GetObservation (time and filter and featureOfInterest)
 #
-# RUN_PARMS: sos_getobs_time_filter_foi.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=om/1.0.0&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsGreaterThan><PropertyName>value</PropertyName><Literal>89.9</Literal></PropertyIsGreaterThan></Filter>&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>&featureOfInterest=<gml:Envelope><gml:lowerCorner srsName="EPSG:4326">-76 44</gml:lowerCorner><gml:upperCorner srsName="EPSG:4326">-64 47</gml:upperCorner></gml:Envelope>" > [RESULT]
+# RUN_PARMS: sos_getobs_time_filter_foi.xml [MAPSERV] QUERY_STRING="map=sos.map&service=SOS&version=1.0.0&request=GetObservation&responseFormat=text/xml; subtype=\"om/1.0.0\"&offering=Water&observedproperty=WaterQuality&result=<Filter><PropertyIsGreaterThan><PropertyName>value</PropertyName><Literal>89.9</Literal></PropertyIsGreaterThan></Filter>&eventTime=<gml:TimePeriod><gml:beginPosition>1990</gml:beginPosition><gml:endPosition>2003</gml:endPosition></gml:TimePeriod>&featureOfInterest=<gml:Envelope><gml:lowerCorner srsName="EPSG:4326">-76 44</gml:lowerCorner><gml:upperCorner srsName="EPSG:4326">-64 47</gml:upperCorner></gml:Envelope>" > [RESULT]
 #
 # DescribeObservationType
 #



More information about the mapserver-commits mailing list