[mapserver-commits] r11399 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-03-30 13:42:04 -0700 (Wed, 30 Mar 2011)
New Revision: 11399

Modified:
   trunk/mapserver/mapogcsos.c
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwcs20.c
   trunk/mapserver/mapwfs.c
   trunk/mapserver/mapwms.c
Log:
Clarified the error message about OGC services not enabled

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2011-03-30 20:37:28 UTC (rev 11398)
+++ trunk/mapserver/mapogcsos.c	2011-03-30 20:42:04 UTC (rev 11399)
@@ -2858,7 +2858,7 @@
     msOWSRequestLayersEnabled(map, "S", paramsObj->pszRequest, ows_request);
     if (ows_request->numlayers == 0)
     {
-        msSetError(MS_SOSERR, "Unsupported SOS request", "msSOSDispatch()");
+        msSetError(MS_SOSERR, "SOS request not enabled. Check sos/ows_enable_request settings.", "msSOSDispatch()");
         msSOSFreeParamsObj(paramsObj);
         free(paramsObj);
         paramsObj = NULL;

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2011-03-30 20:37:28 UTC (rev 11398)
+++ trunk/mapserver/mapwcs.c	2011-03-30 20:42:04 UTC (rev 11399)
@@ -2028,7 +2028,7 @@
   msOWSRequestLayersEnabled(map, "C", params->request, ows_request);
   if (ows_request->numlayers == 0)
   {
-      msSetError(MS_WCSERR, "Unsupported WCS request", "msWCSDispatch()");
+      msSetError(MS_WCSERR, "WCS request not enabled. Check wcs/ows_enable_request settings.", "msWCSDispatch()");
       msWCSException(map, "InvalidParameterValue", "request",
                      params->version );
       msWCSFreeParams(params); /* clean up */

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2011-03-30 20:37:28 UTC (rev 11398)
+++ trunk/mapserver/mapwcs20.c	2011-03-30 20:42:04 UTC (rev 11399)
@@ -4069,7 +4069,7 @@
     msOWSRequestLayersEnabled(map, "C", params->request, ows_request);
     if (ows_request->numlayers == 0)
     {
-        msSetError(MS_WCSERR, "Unsupported WCS request", "msWCSDispatch20()");
+        msSetError(MS_WCSERR, "WCS request not enabled. Check wcs/ows_enable_request settings.", "msWCSDispatch20()");
         msWCSException20(map, "InvalidParameterValue", "request",
                          params->version );
         msWCSFreeParamsObj20(params); /* clean up */

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2011-03-30 20:37:28 UTC (rev 11398)
+++ trunk/mapserver/mapwfs.c	2011-03-30 20:42:04 UTC (rev 11399)
@@ -2861,8 +2861,7 @@
       msOWSRequestLayersEnabled(map, "F", paramsObj->pszRequest, ows_request);
       if (ows_request->numlayers == 0)
       {
-          msSetError(MS_WFSERR, "Unsupported WFS request: %s", "msWFSDispatch()",
-                     paramsObj->pszRequest);
+          msSetError(MS_WFSERR, "WFS request not enabled. Check wfs/ows_enable_request settings.", "msWFSDispatch()");
           returnvalue = msWFSException(map, "request", "InvalidParameterValue", paramsObj->pszVersion);
           msWFSFreeParamsObj(paramsObj);
           free(paramsObj);
@@ -2902,8 +2901,7 @@
       msOWSRequestLayersEnabled(map, "F", paramsObj->pszRequest, ows_request);
       if (ows_request->numlayers == 0)
       {
-          msSetError(MS_WFSERR, "Unsupported WFS request: %s", "msWFSDispatch()",
-                     paramsObj->pszRequest);
+          msSetError(MS_WFSERR, "WFS request not enabled. Check wfs/ows_enable_request settings.", "msWFSDispatch()");
           returnvalue = msWFSException(map, "request", "InvalidParameterValue", paramsObj->pszVersion);
           msWFSFreeParamsObj(paramsObj);
           free(paramsObj);
@@ -3114,13 +3112,20 @@
           wfsparams->pszRequest = "DescribeFeatureType";
 
         msOWSRequestLayersEnabled(map, "F", wfsparams->pszRequest, ows_request);
-        if (wfsparams->pszRequest == NULL || ows_request->numlayers == 0)
+        if (wfsparams->pszRequest == NULL)
         {
           /* Unsupported WFS request */
-            msSetError(MS_WFSERR, "Unsupported WFS request", "msWFSParseRequest()");
+            msSetError(MS_WFSERR, "Unsupported WFS request.", "msWFSParseRequest()");
             return MS_FAILURE;
         }
 
+        if (ows_request->numlayers == 0)
+        {
+            /* not enabled WFS request */
+            msSetError(MS_WFSERR, "WFS request not enabled. Check wfs/ows_enable_request settings.", "msWFSParseRequest()");
+            return MS_FAILURE;
+        }
+
         /*get version and service if available*/
         pszValue = xmlGetProp(rootnode, (xmlChar *)"version");
         if (pszValue)

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2011-03-30 20:37:28 UTC (rev 11398)
+++ trunk/mapserver/mapwms.c	2011-03-30 20:42:04 UTC (rev 11399)
@@ -3955,7 +3955,7 @@
       msOWSRequestLayersEnabled(map, "M", "GetCapabilities", ows_request); 
       if (ows_request->numlayers == 0)
       {
-          msSetError(MS_WMSERR, "Incomplete or unsupported WMS request", "msWMSGetCapabilities()");
+          msSetError(MS_WMSERR, "WMS request not enabled. Check wms/ows_enable_request settings.", "msWMSGetCapabilities()");
           return msWMSException(map, nVersion, NULL, wms_exception_format);
       }
       return msWMSGetCapabilities(map, nVersion, req, ows_request, updatesequence, wms_exception_format);
@@ -4084,7 +4084,7 @@
       msOWSRequestLayersEnabled(map, "M", request_tmp, ows_request); 
       if (ows_request->numlayers == 0)
       {
-          msSetError(MS_WMSERR, "Incomplete or unsupported WMS request", "msWMSDispatch()");
+          msSetError(MS_WMSERR, "WMS request not enabled. Check wms/ows_enable_request settings.", "msWMSDispatch()");
           return msWMSException(map, nVersion, NULL, wms_exception_format);
       }
   }