Moved check single value in expressionFromOgcFilter

qgis · Feb 8, 2017 · 2dfb6dcc5d181f21b30ed4eaa90674978427102c · 2dfb6dc
1 parent 64d1848
commit 2dfb6dcc5d181f21b30ed4eaa90674978427102c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -1603,6 +1603,16 @@ QgsExpression* QgsOgcUtils::expressionFromOgcFilter( const QDomElement& element
 
   QgsExpression *expr = new QgsExpression();
 
+  // check if it is a single string value not having DOM elements
+  // that express OGC operators
+  if ( element.firstChild().nodeType() == QDomNode::TextNode )
+  {
+    expr->setExpression( element.firstChild().nodeValue() );
+    return expr;
+  }
+
+  // then check OGC DOM elements that contain OGC tags specifying
+  // OGC operators.
   QDomElement childElem = element.firstChildElement();
   while ( !childElem.isNull() )
   {

diff --git a/src/core/symbology-ng/qgssymbollayerutils.cpp b/src/core/symbology-ng/qgssymbollayerutils.cpp
@@ -2515,14 +2515,6 @@ bool QgsSymbolLayerUtils::functionFromSldElement( QDomElement &element, QString
     return false;
   }
 
-  // check if it is a single string value
-  if ( elem.hasChildNodes() &&
-       elem.firstChild().nodeType() == QDomNode::TextNode )
-  {
-    function = elem.firstChild().nodeValue();
-    return true;
-  }
-
   // parse ogc:Filter
   QgsExpression *expr = QgsOgcUtils::expressionFromOgcFilter( elem );
   if ( !expr )