[mapguide-commits] r5412 - trunk/MgDev/Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-11-28 21:49:48 -0800 (Sun, 28 Nov 2010)
New Revision: 5412

Modified:
   trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp
Log:
Gaia didn?\226?\128?\153t implement the GetFeatureInfo request correctly in WMS 1.3.0, because the Info_format is a mandatory request parameter specified in WMS 1.3.0 spec.

I refine the error message and show user where the problem is. 

Modified: trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp	2010-11-29 02:25:23 UTC (rev 5411)
+++ trunk/MgDev/Web/src/HttpHandler/OgcWmsServer.cpp	2010-11-29 05:49:48 UTC (rev 5412)
@@ -657,29 +657,32 @@
                 bValid = false;
             }
 
-            CPSZ pszSupportedFormats = this->Definition(_("Formats.GetFeatureInfo")); //NOXLATE
-            bool bSupport = false;
-
-            if(pszSupportedFormats != NULL)
+            if(bValid)
             {
-                MgXmlParser SupportedFormats(pszSupportedFormats);
+                CPSZ pszSupportedFormats = this->Definition(_("Formats.GetFeatureInfo")); //NOXLATE
+                bool bSupport = false;
 
-                while(SupportedFormats.Next())
+                if(pszSupportedFormats != NULL)
                 {
-                    MgXmlNode& node = SupportedFormats.Current();
-                    if(node.Contents() == pszFormat)
+                    MgXmlParser SupportedFormats(pszSupportedFormats);
+
+                    while(SupportedFormats.Next())
                     {
-                        bSupport = true;
-                        break;
+                        MgXmlNode& node = SupportedFormats.Current();
+                        if(node.Contents() == pszFormat)
+                        {
+                            bSupport = true;
+                            break;
+                        }
                     }
                 }
-            }
 
-            if(!bSupport)
-            {
-                ServiceExceptionReportResponse(MgOgcWmsException(MgOgcWmsException::kpszInvalidFormat,
-                                                         kpszExceptionMessageInvalidInfoFormat));
-                bValid = false;
+                if(!bSupport)
+                {
+                    ServiceExceptionReportResponse(MgOgcWmsException(MgOgcWmsException::kpszInvalidFormat,
+                                                             kpszExceptionMessageInvalidInfoFormat));
+                    bValid = false;
+                }
             }
         }
     }