[QGIS Commit] r9475 - trunk/qgis/src/providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-10-13 12:23:02 -0400 (Mon, 13 Oct 2008)
New Revision: 9475

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
   trunk/qgis/src/providers/wms/qgswmsprovider.h
Log:
fix #1346

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2008-10-13 14:15:58 UTC (rev 9474)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2008-10-13 16:23:02 UTC (rev 9475)
@@ -72,22 +72,8 @@
   // 2) http://xxx.xxx.xx/yyy/yyy?
   // 3) http://xxx.xxx.xx/yyy/yyy?zzz=www
 
-  // Prepare the URI so that we can later simply append param=value
-  baseUrl = httpuri;
+  baseUrl = prepareUri(httpuri);
 
-  if ( !( baseUrl.contains( "?" ) ) )
-  {
-    baseUrl.append( "?" );
-  }
-  else if (
-    ( baseUrl.right( 1 ) != "?" )
-    &&
-    ( baseUrl.right( 1 ) != "&" )
-  )
-  {
-    baseUrl.append( "&" );
-  }
-
   QgsDebugMsg( "baseUrl = " + baseUrl );
 
 //  getServerCapabilities();
@@ -112,6 +98,23 @@
   QgsDebugMsg( "QgsWmsProvider: exiting constructor." );
 }
 
+QString QgsWmsProvider::prepareUri(QString uri)
+{
+  if ( !( uri.contains( "?" ) ) )
+  {
+    uri.append( "?" );
+  }
+  else if (
+    ( uri.right( 1 ) != "?" ) &&
+    ( uri.right( 1 ) != "&" )
+  )
+  {
+    uri.append( "&" );
+  }
+
+  return uri;
+}
+
 QgsWmsProvider::~QgsWmsProvider()
 {
   QgsDebugMsg( "QgsWmsProvider: deconstructing." );
@@ -376,9 +379,8 @@
     crsKey = "CRS";
   }
 
-  QString url = mCapabilities.capability.request.getMap.dcpType.front().http.get.onlineResource.xlinkHref;
+  QString url = prepareUri(mCapabilities.capability.request.getMap.dcpType.front().http.get.onlineResource.xlinkHref);
 
-  url += "?";
   url += "SERVICE=WMS";
   url += "&";
   url += "VERSION=" + mCapabilities.version;

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.h
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.h	2008-10-13 14:15:58 UTC (rev 9474)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.h	2008-10-13 16:23:02 UTC (rev 9475)
@@ -684,6 +684,12 @@
      */
     bool calculateExtent();
 
+    /**
+     * \brief Prepare the URI so that we can later simply append param=value
+     * \param uri uri to prepare
+     * \retval prepared uri
+     */
+    QString prepareUri(QString uri);
 
     //! Data source URI of the WMS for this layer
     QString httpuri;