Manage LayerNotDefined exception

pblottiere · pblottiere · commit 2fc3da3e7a64 · 2019-03-28T12:27:12.000+01:00
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -395,8 +395,10 @@ void QgsWmsRenderContext::searchLayersToRenderSld()
       }
       else
       {
-        throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),
-                                      QStringLiteral( "Layer \"%1\" does not exist" ).arg( lname ) );
+        QgsWmsParameter param( QgsWmsParameter::LAYER );
+        param.mValue = lname;
+        throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                      param );
       }
     }
   }
@@ -439,8 +441,10 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()
     }
     else
     {
-      throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),
-                                    QStringLiteral( "Layer \"%1\" does not exist" ).arg( nickname ) );
+      QgsWmsParameter param( QgsWmsParameter::LAYER );
+      param.mValue = nickname;
+      throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                    param );
     }
   }
 }
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1309,8 +1309,11 @@ namespace QgsWms
       }
       if ( !validLayer && !mContext.isValidLayer( queryLayer ) && !mContext.isValidGroup( queryLayer ) )
       {
-        QString msg = QObject::tr( "Layer '%1' not found" ).arg( queryLayer );
-        throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ), msg );
+        QgsWmsParameter param( QgsWmsParameter::LAYER );
+        param.mValue = queryLayer;
+        throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,
+                                      param );
+
       }
       else if ( ( validLayer && !queryableLayer ) || ( !validLayer && mContext.isValidGroup( queryLayer ) ) )
       {
diff --git a/src/server/services/wms/qgswmsserviceexception.h b/src/server/services/wms/qgswmsserviceexception.h
@@ -128,6 +128,10 @@ namespace QgsWms
             break;
           }
           case OGC_LAYER_NOT_DEFINED:
+          {
+            message = QStringLiteral( "The layer '%1' does not exist." ).arg( parameter.toString() );
+            break;
+          }
           case OGC_STYLE_NOT_DEFINED:
           case OGC_LAYER_NOT_QUERYABLE:
           case OGC_CURRENT_UPDATE_SEQUENCE:

Original file line number	Diff line number	Diff line change
`@@ -395,8 +395,10 @@ void QgsWmsRenderContext::searchLayersToRenderSld()`
`395`	`395`	`}`
`396`	`396`	`else`
`397`	`397`	`{`
`398`		`- throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),`
`399`		`- QStringLiteral( "Layer \"%1\" does not exist" ).arg( lname ) );`
	`398`	`+ QgsWmsParameter param( QgsWmsParameter::LAYER );`
	`399`	`+ param.mValue = lname;`
	`400`	`+ throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,`
	`401`	`+ param );`
`400`	`402`	`}`
`401`	`403`	`}`
`402`	`404`	`}`
`@@ -439,8 +441,10 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()`
`439`	`441`	`}`
`440`	`442`	`else`
`441`	`443`	`{`
`442`		`- throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ),`
`443`		`- QStringLiteral( "Layer \"%1\" does not exist" ).arg( nickname ) );`
	`444`	`+ QgsWmsParameter param( QgsWmsParameter::LAYER );`
	`445`	`+ param.mValue = nickname;`
	`446`	`+ throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,`
	`447`	`+ param );`
`444`	`448`	`}`
`445`	`449`	`}`
`446`	`450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1309,8 +1309,11 @@ namespace QgsWms`
`1309`	`1309`	`}`
`1310`	`1310`	`if ( !validLayer && !mContext.isValidLayer( queryLayer ) && !mContext.isValidGroup( queryLayer ) )`
`1311`	`1311`	`{`
`1312`		`- QString msg = QObject::tr( "Layer '%1' not found" ).arg( queryLayer );`
`1313`		`- throw QgsBadRequestException( QStringLiteral( "LayerNotDefined" ), msg );`
	`1312`	`+ QgsWmsParameter param( QgsWmsParameter::LAYER );`
	`1313`	`+ param.mValue = queryLayer;`
	`1314`	`+ throw QgsBadRequestException( QgsServiceException::OGC_LAYER_NOT_DEFINED,`
	`1315`	`+ param );`
	`1316`	`+`
`1314`	`1317`	`}`
`1315`	`1318`	`else if ( ( validLayer && !queryableLayer ) \|\| ( !validLayer && mContext.isValidGroup( queryLayer ) ) )`
`1316`	`1319`	`{`