[mapserver-commits] r10611 - in trunk: mapserver msautotest/wxs/expected

[svn at osgeo.org]

Author: tomkralidis
Date: 2010-10-18 06:48:55 -0700 (Mon, 18 Oct 2010)
New Revision: 10611

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs11.c
   trunk/msautotest/wxs/expected/wfs11_cap.xml
   trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
Log:
apply patch (thanks rouault) to advertise resultType=hits in WFS 1.1 Capabilities (#3575)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-10-17 18:28:09 UTC (rev 10610)
+++ trunk/mapserver/HISTORY.TXT	2010-10-18 13:48:55 UTC (rev 10611)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- apply patch (thanks rouault) to advertise resultType=hits in WFS 1.1 Capabilities (#3575)
+
 - mapshape.c: Fix writing of geometries with z/m and fail gracefully attempting
   to create such files if USE_POINT_Z_M is not enabled (#3564)
 

Modified: trunk/mapserver/mapwfs11.c
===================================================================
--- trunk/mapserver/mapwfs11.c	2010-10-17 18:28:09 UTC (rev 10610)
+++ trunk/mapserver/mapwfs11.c	2010-10-18 13:48:55 UTC (rev 10611)
@@ -392,15 +392,10 @@
                                                                  OWS_METHOD_GETPOST, script_url_encoded));
      xmlAddChild(psMainNode, psNode);
 
-     /*resultType: TODO support hits*/
-     xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws, 
-                                                                "Parameter", "resultType", 
-                                                                "results"));
-     /*
-     xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws, 
+     xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws,
                                                                  "Parameter", "resultType", 
-                                                                 "results, hits"));
-     */
+                                                                 "results,hits"));
+
      formats_list = msWFSGetOutputFormatList( map, NULL, "1.1.0" );
      xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws, 
                                                                   "Parameter", "outputFormat", 

Modified: trunk/msautotest/wxs/expected/wfs11_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_cap.xml	2010-10-17 18:28:09 UTC (rev 10610)
+++ trunk/msautotest/wxs/expected/wfs11_cap.xml	2010-10-18 13:48:55 UTC (rev 10611)
@@ -83,6 +83,7 @@
       </ows:DCP>
       <ows:Parameter name="resultType">
         <ows:Value>results</ows:Value>
+        <ows:Value>hits</ows:Value>
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>

Modified: trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml	2010-10-17 18:28:09 UTC (rev 10610)
+++ trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml	2010-10-18 13:48:55 UTC (rev 10611)
@@ -83,6 +83,7 @@
       </ows:DCP>
       <ows:Parameter name="resultType">
         <ows:Value>results</ows:Value>
+        <ows:Value>hits</ows:Value>
       </ows:Parameter>
       <ows:Parameter name="outputFormat">
         <ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>