WMS 1.3 compliance: Each OnlineResource URL intended for HTTP Get requests in the capabilities document is a URL prefix

mhugent · mhugent · commit 36e89a31467e · 2016-11-29T16:46:26.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -427,6 +427,12 @@ QDomDocument QgsWmsServer::getCapabilities( const QString& version, bool fullPro
     hrefString = serviceUrl();
   }
 
+  //href needs to be a prefix
+  if ( !hrefString.endsWith( "?" ) && !hrefString.endsWith( "&" ) )
+  {
+    hrefString.append( hrefString.contains( "?" ) ? "&" : "?" );
+  }
+
   if ( version == QLatin1String( "1.1.1" ) )
   {
     doc = QDomDocument( QStringLiteral( "WMT_MS_Capabilities SYSTEM 'http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd'" ) );  //WMS 1.1.1 needs DOCTYPE  "SYSTEM http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd"

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,12 @@ QDomDocument QgsWmsServer::getCapabilities( const QString& version, bool fullPro`
`427`	`427`	`hrefString = serviceUrl();`
`428`	`428`	`}`
`429`	`429`
	`430`	`+ //href needs to be a prefix`
	`431`	`+ if ( !hrefString.endsWith( "?" ) && !hrefString.endsWith( "&" ) )`
	`432`	`+ {`
	`433`	`+ hrefString.append( hrefString.contains( "?" ) ? "&" : "?" );`
	`434`	`+ }`
	`435`	`+`
`430`	`436`	`if ( version == QLatin1String( "1.1.1" ) )`
`431`	`437`	`{`
`432`	`438`	`doc = QDomDocument( QStringLiteral( "WMT_MS_Capabilities SYSTEM 'http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd'" ) ); //WMS 1.1.1 needs DOCTYPE "SYSTEM http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd"`