WFS EXP_FILTER respect complex expressions

elpaso · elpaso · commit ad7ab51f038a · 2019-01-21T12:35:06.000+01:00
diff --git a/src/server/services/wfs/qgswfsparameters.cpp b/src/server/services/wfs/qgswfsparameters.cpp
@@ -76,18 +76,23 @@ namespace QgsWfs
     if ( val.isEmpty() )
       return theList;
 
-    QRegExp rx( exp );
-    if ( rx.indexIn( val, 0 ) == -1 )
-    {
+    if ( exp.isEmpty() )
       theList << val;
-    }
     else
     {
-      int pos = 0;
-      while ( ( pos = rx.indexIn( val, pos ) ) != -1 )
+      QRegExp rx( exp );
+      if ( rx.indexIn( val, 0 ) == -1 )
+      {
+        theList << val;
+      }
+      else
       {
-        theList << rx.cap( 1 );
-        pos += rx.matchedLength();
+        int pos = 0;
+        while ( ( pos = rx.indexIn( val, pos ) ) != -1 )
+        {
+          theList << rx.cap( 1 );
+          pos += rx.matchedLength();
+        }
       }
     }
 
@@ -332,7 +337,7 @@ namespace QgsWfs
 
   QStringList QgsWfsParameters::expFilters() const
   {
-    return mWfsParameters[ QgsWfsParameter::EXP_FILTER ].toStringListWithExp();
+    return mWfsParameters[ QgsWfsParameter::EXP_FILTER ].toStringListWithExp( QString( ) );
   }
 
   QString QgsWfsParameters::geometryNameAsString() const
diff --git a/src/server/services/wfs/qgswfsparameters.h b/src/server/services/wfs/qgswfsparameters.h
@@ -83,7 +83,7 @@ namespace QgsWfs
 
       /**
        * Converts the parameter into a list of string.
-       * \param exp The expression to use for splitting
+       * \param exp The expression to use for splitting, pass an empty string to avoid splitting
        * \returns A list of strings
        * \throws QgsBadRequestException Invalid parameter exception
        */
