[mapguide-commits] r5403 - in trunk/MgDev: Server/src/Wfs Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-11-24 03:47:03 -0800 (Wed, 24 Nov 2010)
New Revision: 5403

Modified:
   trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
   trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp
Log:
Ticket #1421 OGC WFS 1.1.0 Support

This submission fixes following issue.

If there's a request like http://mapguide_server/mapguide/mapagent.fcgi?service=wms&version=&request=DescribeFeatureType
which version is empty but not NULL, the template version is 1.0.0 but not the highest version.

Modified: trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-11-24 11:11:39 UTC (rev 5402)
+++ trunk/MgDev/Server/src/Wfs/1.0.0.xml.awd	2010-11-24 11:47:03 UTC (rev 5403)
@@ -268,18 +268,11 @@
 
 -->
 <Response request="Exception" content-type="text/xml">
-<ows:ExceptionReport 
-   version="&TemplateVersion;"
-   xmlns:ows="http://www.opengis.net/ows"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
-  <ows:Exception exceptionCode="&Exception.Type;" locator="&Exception.Locator;">
-  <ows:ExceptionText>
-   &Exception.message;
-  </ows:ExceptionText>
- </ows:Exception>
-</ows:ExceptionReport>
-
+<ServiceExceptionReport version="&TemplateVersion;" xmlns="http://www.opengis.net/ogc">
+ <ServiceException code="&Exception.Type;">
+  Request=&Request.request; resulted in an exception: &Exception.message;
+ </ServiceException>
+</ServiceExceptionReport>
 </Response>
 
 </Template>

Modified: trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp	2010-11-24 11:11:39 UTC (rev 5402)
+++ trunk/MgDev/Web/src/HttpHandler/OgcServer.cpp	2010-11-24 11:47:03 UTC (rev 5403)
@@ -1619,15 +1619,15 @@
 {
     if(m_sNegotiatedVersion.length() == 0 || pszRequested != NULL)
     {
-        if(pszRequested == NULL)
+        if(pszRequested == NULL || SZ_EQ(pszRequested,_("")))
         {
             // Read the VERSION parameter
             pszRequested = this->RequestParameter(kpszQueryStringVersion);
-            if(pszRequested == NULL)
+            if(pszRequested == NULL || SZ_EQ(pszRequested,_("")))
             {
                 // Look for the WMTVER parameter used in older request formats
                 pszRequested = this->RequestParameter(kpszQueryStringWmtVersion);
-                if(pszRequested == NULL) // still
+                if(pszRequested == NULL || SZ_EQ(pszRequested,_(""))) // still
                 {
                     pszRequested = kpszVersionRediculouslyHighVersion;
                 }