Permalink
Browse files

Merge branch 'master' of github.com:mapserver/mapserver

Conflicts:
	HISTORY.TXT
  • Loading branch information...
2 parents de0dd13 + c9a832e commit fd7af49fc60bcb20409579bab2800dd50d8a7e76 @Schpidi Schpidi committed May 29, 2012
Showing with 22 additions and 11 deletions.
  1. +2 −0 HISTORY.TXT
  2. +2 −1 mapogcsos.c
  3. +4 −2 mapwcs.c
  4. +2 −2 mapwcs20.c
  5. +6 −3 mapwfs.c
  6. +6 −3 mapwms.c
View
@@ -16,6 +16,8 @@ Current Version (git master, 6.1-dev, future 6.2):
- Added INSPIRE ExtendedCapabilities and DOCTYPE definition to WMS 1.1.1 (#3608)
+- Fix wms_enable_request-related errors are not properly tagged (#4187)
+
- Fixed locations of supported and native formats in Capabilities and CoverageDescriptions for WCS 2.0 (#4003)
- Made format parameter for WCS 2.0 GetCoverage requests optional (#4003)
View
@@ -1893,7 +1893,8 @@ int msSOSGetObservation(mapObj *map, sosParamsObj *sosparams, cgiRequestObj *req
}
if (i==map->numlayers) {
- msSetError(MS_SOSERR, "Offering %s not found.", "msSOSGetObservation()", sosparams->pszOffering);
+ msSetError(MS_SOSERR, "Offering %s not found. A layer might be disabled for \
+this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()", sosparams->pszOffering);
return msSOSException(map, "offering", "InvalidParameterValue");
}
View
@@ -1378,7 +1378,8 @@ static int msWCSDescribeCoverage(mapObj *map, wcsParamsObj *params, owsRequestOb
/* i = msGetLayerIndex(map, coverages[k]); */
if(i == map->numlayers) { /* coverage not found */
- msSetError( MS_WCSERR, "COVERAGE %s cannot be opened / does not exist", "msWCSDescribeCoverage()", coverages[k]);
+ msSetError( MS_WCSERR, "COVERAGE %s cannot be opened / does not exist. A layer might be disabled for \
+this request. Check wcs/ows_enable_request settings.", "msWCSDescribeCoverage()", coverages[k]);
return msWCSException(map, "CoverageNotDefined", "coverage", params->version );
}
} /* next coverage */
@@ -1652,7 +1653,8 @@ static int msWCSGetCoverage(mapObj *map, cgiRequestObj *request,
}
if(lp == NULL) {
- msSetError( MS_WCSERR, "COVERAGE=%s not found, not in supported layer list.", "msWCSGetCoverage()", params->coverages[0] );
+ msSetError( MS_WCSERR, "COVERAGE=%s not found, not in supported layer list. A layer might be disabled for \
+this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage()", params->coverages[0] );
return msWCSException(map, "InvalidParameterValue", "coverage", params->version);
}
View
@@ -3532,8 +3532,8 @@ int msWCSGetCoverage20(mapObj *map, cgiRequestObj *request,
if (layer == NULL)
{
msSetError(MS_WCSERR,
- "COVERAGE=%s not found, not in supported layer list.",
- "msWCSGetCoverage20()", params->ids[0]);
+ "COVERAGE=%s not found, not in supported layer list. A layer might be disabled for \
+this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", params->ids[0]);
return msWCSException(map, "InvalidParameterValue", "coverage",
params->version);
}
View
@@ -1153,7 +1153,8 @@ int msWFSDescribeFeatureType(mapObj *map, wfsParamsObj *paramsObj, owsRequestObj
for (i=0; i<numlayers; i++) {
int index = msGetLayerIndex(map, layers[i]);
if ( (index < 0) || (!msIntegerInArray(GET_LAYER(map, index)->index, ows_request->enabled_layers, ows_request->numlayers)) ) {
- msSetError(MS_WFSERR, "Invalid typename (%s).", "msWFSDescribeFeatureType()", layers[i]);/* paramsObj->pszTypeName); */
+ msSetError(MS_WFSERR, "Invalid typename (%s). A layer might be disabled for \
+this request. Check wfs/ows_enable_request settings.", "msWFSDescribeFeatureType()", layers[i]);/* paramsObj->pszTypeName); */
return msWFSException(map, "typename", "InvalidParameterValue", paramsObj->pszVersion);
}
}
@@ -2231,7 +2232,8 @@ int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req, ow
for (i=0; i<nFilters; i++) {
iLayerIndex = msGetLayerIndex(map, layers[i]);
if (iLayerIndex < 0) {
- msSetError(MS_WFSERR, "Invalid Typename in GetFeature : %s", "msWFSGetFeature()", layers[i]);
+ msSetError(MS_WFSERR, "Invalid Typename in GetFeature : %s. A layer might be disabled for \
+this request. Check wfs/ows_enable_request settings.", "msWFSGetFeature()", layers[i]);
return msWFSException(map, "typename", "InvalidParameterValue", paramsObj->pszVersion);
}
psNode = FLTParseFilterEncoding(paszFilter[i]);
@@ -2393,7 +2395,8 @@ int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req, ow
if (k == map->numlayers)/*layer not found*/
{
msSetError(MS_WFSERR,
- "Invalid typename given with FeatureId in GetFeature : %s", "msWFSGetFeature()",
+ "Invalid typename given with FeatureId in GetFeature : %s. A layer might be disabled for \
+this request. Check wfs/ows_enable_request settings.", "msWFSGetFeature()",
aFIDLayers[j]);
if (aFIDLayers && aFIDValues)
View
@@ -1484,7 +1484,8 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
{
if (invalidlayers > 0)
{
- msSetError(MS_WMSERR, "Invalid layer(s) given in the LAYERS parameter.",
+ msSetError(MS_WMSERR, "Invalid layer(s) given in the LAYERS parameter. A layer might be disabled for \
+this request. Check wms/ows_enable_request settings.",
"msWMSLoadGetMapParams()");
return msWMSException(map, nVersion, "LayerNotDefined", wms_exception_format);
}
@@ -4870,7 +4871,8 @@ int msWMSLegendGraphic(mapObj *map, int nVersion, char **names,
if (nLayers == 0)
{
- msSetError(MS_WMSERR, "Invalid layer given in the LAYER parameter.",
+ msSetError(MS_WMSERR, "Invalid layer given in the LAYER parameter. A layer might be disabled for \
+this request. Check wms/ows_enable_request settings.",
"msWMSGetLegendGraphic()");
return msWMSException(map, nVersion, "LayerNotDefined", wms_exception_format);
}
@@ -5112,7 +5114,8 @@ int msWMSGetStyles(mapObj *map, int nVersion, char **names,
/* validate all layers given. If an invalid layer is sent, return an exception. */
if (validlayer == 0)
{
- msSetError(MS_WMSERR, "Invalid layer(s) given in the LAYERS parameter.",
+ msSetError(MS_WMSERR, "Invalid layer(s) given in the LAYERS parameter. A layer might be disabled for \
+this request. Check wms/ows_enable_request settings.",
"msWMSGetStyles()");
return msWMSException(map, nVersion, "LayerNotDefined", wms_exception_format);
}

0 comments on commit fd7af49

Please sign in to comment.