[QGIS Commit] r8992 - trunk/qgis/src/plugins/wfs

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-05 06:09:40 -0400 (Tue, 05 Aug 2008)
New Revision: 8992

Modified:
   trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
Log:
Fix for ticket 1165

Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2008-08-05 09:04:03 UTC (rev 8991)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2008-08-05 10:09:40 UTC (rev 8992)
@@ -137,10 +137,6 @@
 
 int QgsWFSSourceSelect::getCapabilitiesGET(QString uri, std::list<QString>& typenames, std::list< std::list<QString> >& crs, std::list<QString>& titles, std::list<QString>& abstracts)
 {
-  if(!(uri.contains("?"))) 
-    {
-      uri.append("?");
-    }
   QString request = uri + "SERVICE=WFS&REQUEST=GetCapabilities&VERSION=1.0.0";
   
   QByteArray result;
@@ -280,6 +276,16 @@
   std::list<QString> titles;
   std::list<QString> abstracts;
 
+  //modify mUri to add '?' or '&' at the end if it is not already there
+  if ( !(mUri.contains("?")) ) 
+    {
+      mUri.append("?");
+    }
+  else if ((mUri.right(1) != "?") && (mUri.right(1) != "&"))
+    {
+      mUri.append("&");
+    }
+
   if(getCapabilities(mUri, QgsWFSSourceSelect::GET, typenames, crsList, titles, abstracts) != 0)
     {
       qWarning("error during GetCapabilities request");