Merge pull request #7860 from pblottiere/filter_2

Expression from WFS 2.0 filters
qgis · Sep 13, 2018 · f99b2db · f99b2db
2 parents 79dc991 + 5fd9501
commit f99b2db
Show file tree

Hide file tree

Showing 4 changed files with 689 additions and 457 deletions.
diff --git a/python/core/auto_generated/qgsogcutils.sip.in b/python/core/auto_generated/qgsogcutils.sip.in
@@ -149,6 +149,17 @@ according to the OGC filter specs (=,!=,<,>,<=,>=,AND,OR,NOT)
       FILTER_FES_2_0
     };
 
+    static QgsExpression *expressionFromOgcFilter( const QDomElement &element, FilterVersion version, QgsVectorLayer *layer = 0 ) /Factory/;
+%Docstring
+Returns an expression from a WFS filter embedded in a document.
+
+:param element: The WFS Filter
+:param version: The WFS version
+:param layer: Layer to use to retrieve field values from literal filters
+
+.. versionadded:: 3.4
+%End
+
 
     static QDomElement expressionToOgcExpression( const QgsExpression &exp, QDomDocument &doc, QString *errorMessage = 0 );
 %Docstring