Support writing filters by hand, remove namespace from filter element…

…, better comments
qgis · Dec 9, 2011 · b4fb1ef · b4fb1ef
1 parent 2e9a379
commit b4fb1ef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -978,7 +978,7 @@ bool QgsExpression::toOGCFilter( QDomDocument& doc ) const
   }
 
   doc.clear();
-  QDomElement filterElem = doc.createElementNS( "http://www.opengis.net/fes/2.0", "Filter" );
+  QDomElement filterElem = doc.createElement( "Filter" );
   doc.appendChild( filterElem );
   return mRootNode->toOGCFilter( doc, filterElem );
 }

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -122,8 +122,8 @@ class CORE_EXPORT QgsExpression
 
     //! Return the parsed expression as a string - useful for debugging
     QString dump() const;
-    //! Creates ogc filter xml document
-    //! @return true in case of success
+    //! Creates ogc filter xml document. Supports minimum standard filter according to the OGC filter specs (=,!=,<,>,<=,>=,AND,OR,NOT)
+    //! @return true in case of success. False if string contains something that goes beyond the minimum standard filter
     bool toOGCFilter( QDomDocument& doc ) const;
 
     //! Return calculator used for distance and area calculations

diff --git a/src/providers/wfs/qgswfsconnection.cpp b/src/providers/wfs/qgswfsconnection.cpp
@@ -55,12 +55,19 @@ QString QgsWFSConnection::uriGetFeature( QString typeName, QString crsString, QS
   QString filterString;
   if ( !filter.isEmpty() )
   {
-    QgsExpression filterExpression( filter );
+    //test if filterString is already an OGC filter xml
     QDomDocument filterDoc;
-    if ( filterExpression.toOGCFilter( filterDoc ) )
+    if( !filterDoc.setContent( filter ) )
     {
-      filterString = "&FILTER=" + filterDoc.toString();
+      //if not, if must be a QGIS expression
+      QgsExpression filterExpression( filter );
+      if( !filterExpression.toOGCFilter( filterDoc ) )
+      {
+        //error
+      }
+
     }
+    filterString = "&FILTER=" + filterDoc.toString();
   }
 
   QString bBoxString;

diff --git a/src/providers/wfs/qgswfsconnection.h b/src/providers/wfs/qgswfsconnection.h
@@ -27,6 +27,7 @@ class QgsWFSConnection : public QObject
     //! URI to get schema of wfs layer
     QString uriDescribeFeatureType( const QString& typeName ) const;
     //! URI to get features
+    //! @param filter can be an OGC filter xml or a QGIS expression (containing =,!=, <,>,<=, >=, AND, OR, NOT )
     QString uriGetFeature( QString typeName,
                            QString crs = QString(),
                            QString filter = QString(),