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

[svn at osgeo.org]

Author: tomkralidis
Date: 2010-02-20 22:31:42 -0500 (Sat, 20 Feb 2010)
New Revision: 9831

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs.c
   trunk/msautotest/wxs/expected/wfs11_exception.xml
   trunk/msautotest/wxs/expected/wfs11_exception_invalid_srsname.xml
Log:
fix WFS 1.1.0 exception attributes (#3301)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-02-21 02:59:51 UTC (rev 9830)
+++ trunk/mapserver/HISTORY.TXT	2010-02-21 03:31:42 UTC (rev 9831)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- fix WFS 1.1.0 exception attributes (#3301)
+
 - add more useful error message when query file extension test fails (#3302)
 
 - s/gml:null/gml:Null for empty WFS GetFeature responses (#3299)

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2010-02-21 02:59:51 UTC (rev 9830)
+++ trunk/mapserver/mapwfs.c	2010-02-21 03:31:42 UTC (rev 9831)
@@ -55,7 +55,7 @@
       version = "1.0.0";
 
     if( msOWSParseVersionString(version) >= OWS_1_1_0 )
-      return msWFSException11( map, code, locator, version );
+      return msWFSException11( map, locator, code, version );
 
     encoding = msOWSLookupMetadata(&(map->web.metadata), "FO", "encoding");
     if (encoding)

Modified: trunk/msautotest/wxs/expected/wfs11_exception.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_exception.xml	2010-02-21 02:59:51 UTC (rev 9830)
+++ trunk/msautotest/wxs/expected/wfs11_exception.xml	2010-02-21 03:31:42 UTC (rev 9831)
@@ -2,7 +2,7 @@
 
 <?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" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
-  <ows:Exception exceptionCode="request" locator="MissingParameterValue">
+  <ows:Exception exceptionCode="MissingParameterValue" locator="request">
     <ows:ExceptionText>msWFSDispatch(): WFS server error. Incomplete WFS request: REQUEST parameter missing</ows:ExceptionText>
   </ows:Exception>
 </ows:ExceptionReport>

Modified: trunk/msautotest/wxs/expected/wfs11_exception_invalid_srsname.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_exception_invalid_srsname.xml	2010-02-21 02:59:51 UTC (rev 9830)
+++ trunk/msautotest/wxs/expected/wfs11_exception_invalid_srsname.xml	2010-02-21 03:31:42 UTC (rev 9831)
@@ -2,7 +2,7 @@
 
 <?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" version="1.1.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
-  <ows:Exception exceptionCode="typename" locator="InvalidParameterValue">
+  <ows:Exception exceptionCode="InvalidParameterValue" locator="typename">
     <ows:ExceptionText>msWFSGetFeature(): WFS server error. Invalid GetFeature Request: SRSNAME value should be valid for all the TYPENAMES. Please check the capabilities and reformulate your request.</ows:ExceptionText>
   </ows:Exception>
 </ows:ExceptionReport>