Fix for ticket 1165

mhugent · mhugent · commit cfe747c1e294 · 2008-08-05T10:09:40.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8992 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/wfs/qgswfssourceselect.cpp b/src/plugins/wfs/qgswfssourceselect.cpp
@@ -137,10 +137,6 @@ int QgsWFSSourceSelect::getCapabilities(const QString& uri, QgsWFSSourceSelect::
 
 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 @@ void QgsWFSSourceSelect::connectToServer()
   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");
