[mapserver-commits] r8670 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-08 15:00:53 -0400 (Sun, 08 Mar 2009)
New Revision: 8670

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs11.c
Log:
WFS 1.1.0 should use OWS Common 1.0.0 (#2925)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-08 18:51:21 UTC (rev 8669)
+++ trunk/mapserver/HISTORY.TXT	2009-03-08 19:00:53 UTC (rev 8670)
@@ -20,6 +20,8 @@
 
 - add support for resultType (#2907)
 
+- WFS 1.1.0 should use OWS Common 1.0.0 (#2925)
+
 Version 5.4.0-beta3 (2009-3-5):
 --------------------------------
 

Modified: trunk/mapserver/mapwfs11.c
===================================================================
--- trunk/mapserver/mapwfs11.c	2009-03-08 18:51:21 UTC (rev 8669)
+++ trunk/mapserver/mapwfs11.c	2009-03-08 19:00:53 UTC (rev 8670)
@@ -51,24 +51,22 @@
     xmlNsPtr   psNsOws    = NULL;
     xmlChar *buffer       = NULL;
     
-
     if (version == NULL)
        version = "1.1.0";
 
+    psNsOws = xmlNewNs(NULL, BAD_CAST "http://www.opengis.net/ows", BAD_CAST "ows");
 
-    psNsOws = xmlNewNs(NULL, BAD_CAST "http://www.opengis.net/ows/1.1", BAD_CAST "ows");
-
     errorString = msGetErrorString("\n");
     errorMessage = msEncodeHTMLEntities(errorString);
     schemasLocation = msEncodeHTMLEntities(msOWSGetSchemasLocation(map));
 
     psDoc = xmlNewDoc(BAD_CAST "1.0");
 
-    psRootNode = msOWSCommonExceptionReport(psNsOws, OWS_1_1_0, schemasLocation, version, msOWSGetLanguage(map, "exception"), exceptionCode, locator, errorMessage);
+    psRootNode = msOWSCommonExceptionReport(psNsOws, OWS_1_0_0, schemasLocation, version, msOWSGetLanguage(map, "exception"), exceptionCode, locator, errorMessage);
 
     xmlDocSetRootElement(psDoc, psRootNode);
 
-    psNsOws = xmlNewNs(psRootNode, BAD_CAST "http://www.opengis.net/ows/1.1", BAD_CAST "ows");
+    psNsOws = xmlNewNs(psRootNode, BAD_CAST "http://www.opengis.net/ows", BAD_CAST "ows");
 
     msIO_printf("Content-type: text/xml%c%c",10,10);
     xmlDocDumpFormatMemoryEnc(psDoc, &buffer, &size, "ISO-8859-1", 1);