SLD support: try to convert OGC Literal to number before using it as string, fix parser error check

brushtyler · brushtyler · commit 7feb1c3b2ba1 · 2012-08-27T17:17:45.000+02:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1948,12 +1948,20 @@ QgsExpression::Node* QgsExpression::NodeLiteral::createFromOgcFilter( QDomElemen
     }
     else
     {
-      // probably a text/CDATA node, convert its content to string
-      operand = new QgsExpression::NodeLiteral( childNode.nodeValue() );
-    }
+      // probably a text/CDATA node
+      QVariant value = childNode.nodeValue();
 
-    if ( !operand )
-      continue;
+      // try to convert the node content to number if possible,
+      // otherwise let's use it as string
+      bool ok;
+      double d = value.toDouble( &ok );
+      if ( ok )
+        value = d;
+
+      operand = new QgsExpression::NodeLiteral( value );
+      if ( !operand )
+        continue;
+    }
 
     // use the concat operator to merge the ogc:Literal children
     if ( !root )
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -1922,7 +1922,7 @@ bool QgsSymbolLayerV2Utils::rotationFromSldElement( QDomElement &element, QStrin
   QDomElement rotationElem = element.firstChildElement( "Rotation" );
   if ( !rotationElem.isNull() )
   {
-    functionFromSldElement( rotationElem, rotationFunc );
+    return functionFromSldElement( rotationElem, rotationFunc );
   }
   return true;
 }
@@ -1943,7 +1943,7 @@ bool QgsSymbolLayerV2Utils::opacityFromSldElement( QDomElement &element, QString
   QDomElement opacityElem = element.firstChildElement( "Opacity" );
   if ( !opacityElem.isNull() )
   {
-    functionFromSldElement( opacityElem, alphaFunc );
+    return functionFromSldElement( opacityElem, alphaFunc );
   }
   return true;
 }
@@ -2086,7 +2086,7 @@ bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QStrin
   if ( !expr )
     return false;
 
-  bool valid = expr->hasParserError();
+  bool valid = !expr->hasParserError();
   if ( !valid )
   {
     QgsDebugMsg( "parser error: " + expr->parserErrorString() );

Original file line number	Diff line number	Diff line change
`@@ -1922,7 +1922,7 @@ bool QgsSymbolLayerV2Utils::rotationFromSldElement( QDomElement &element, QStrin`
`1922`	`1922`	`QDomElement rotationElem = element.firstChildElement( "Rotation" );`
`1923`	`1923`	`if ( !rotationElem.isNull() )`
`1924`	`1924`	`{`
`1925`		`- functionFromSldElement( rotationElem, rotationFunc );`
	`1925`	`+ return functionFromSldElement( rotationElem, rotationFunc );`
`1926`	`1926`	`}`
`1927`	`1927`	`return true;`
`1928`	`1928`	`}`
`@@ -1943,7 +1943,7 @@ bool QgsSymbolLayerV2Utils::opacityFromSldElement( QDomElement &element, QString`
`1943`	`1943`	`QDomElement opacityElem = element.firstChildElement( "Opacity" );`
`1944`	`1944`	`if ( !opacityElem.isNull() )`
`1945`	`1945`	`{`
`1946`		`- functionFromSldElement( opacityElem, alphaFunc );`
	`1946`	`+ return functionFromSldElement( opacityElem, alphaFunc );`
`1947`	`1947`	`}`
`1948`	`1948`	`return true;`
`1949`	`1949`	`}`
`@@ -2086,7 +2086,7 @@ bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QStrin`
`2086`	`2086`	`if ( !expr )`
`2087`	`2087`	`return false;`
`2088`	`2088`
`2089`		`- bool valid = expr->hasParserError();`
	`2089`	`+ bool valid = !expr->hasParserError();`
`2090`	`2090`	`if ( !valid )`
`2091`	`2091`	`{`
`2092`	`2092`	`QgsDebugMsg( "parser error: " + expr->parserErrorString() );`