Fixed a bug where map= was not being published in onlineresource url …

…when project files are not in the same dir as cgi
qgis · Jun 28, 2011 · 6eeb8cd · 6eeb8cd
1 parent 62714a8
commit 6eeb8cd
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -106,14 +106,32 @@ QDomDocument QgsWMSServer::getCapabilities()
   //Some client requests already have http://<SERVER_NAME> in the REQUEST_URI variable
   QString hrefString;
   QString requestUrl = getenv( "REQUEST_URI" );
+  QString mapUrl = requestUrl;
   requestUrl.truncate( requestUrl.indexOf( "?" ) + 1 );
+
+  // find out if a map parameter was specified and ensure
+  // it is propogated to the onlineresource
+  mapUrl.replace( requestUrl, "" );
+  QStringList myTokens = mapUrl.split( "&" );
+  QString myMap = "";
+  QStringListIterator myIterator( myTokens );
+  while ( myIterator.hasNext() )
+  {
+    QString myString = myIterator.next();
+    if ( myString.contains( "map=", Qt::CaseInsensitive ) )
+    {
+      myMap = myString;
+    }
+  }
+
+
   if ( requestUrl.contains( "http" ) )
   {
     hrefString = requestUrl;
   }
   else
   {
-    hrefString = "http://" + QString( getenv( "SERVER_NAME" ) ) + requestUrl;
+    hrefString = "http://" + QString( getenv( "SERVER_NAME" ) ) + requestUrl + myMap;
   }