[BUGFIX] SLD : Support escapeChar attribute of PropertyIsLike

rldhont · rldhont · commit 0ab834e2bc30 · 2019-01-08T20:54:03.000+01:00
In OGC FilterEncoding standard, the PropertyIsLike element has an escapeChar attribute in place of escape attribute.

In the QgsOgcUtils class, the attribute escape or escapeChar is added to PropertyIsLike element, but it only checks escape attribute when it decodes it.

The commit fixed it and adds test.
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -1808,6 +1808,10 @@ QgsExpression::NodeBinaryOperator* QgsOgcUtils::nodeBinaryOperatorFromOgcFilter(
       {
         escape = element.attribute( "escape" );
       }
+      else if ( element.hasAttribute( "escapeChar" ) )
+      {
+        escape = element.attribute( "escapeChar" );
+      }
       // replace
       QString oprValue = static_cast<const QgsExpression::NodeLiteral*>( opRight )->value().toString();
       if ( !wildCard.isEmpty() && wildCard != "%" )
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
@@ -330,13 +330,19 @@ void TestQgsOgcUtils::testExpressionFromOgcFilter_data()
     "<PropertyName>NAME</PropertyName><Literal>._QGIS.\\.</Literal></PropertyIsLike>"
     "</Filter>" )
   << QString( "NAME LIKE '_\\\\_QGIS_.'" );
-  // different single chars
+  // different escape chars
   QTest::newRow( "like escape char" ) << QString(
     "<Filter>"
     "<PropertyIsLike wildCard=\"*\" singleChar=\".\" escape=\"!\">"
     "<PropertyName>NAME</PropertyName><Literal>_QGIS.!.!!%QGIS*!*</Literal></PropertyIsLike>"
     "</Filter>" )
   << QString( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
+  QTest::newRow( "like escape char" ) << QString(
+    "<Filter>"
+    "<PropertyIsLike wildCard=\"*\" singleChar=\".\" escapeChar=\"!\">"
+    "<PropertyName>NAME</PropertyName><Literal>_QGIS.!.!!%QGIS*!*</Literal></PropertyIsLike>"
+    "</Filter>" )
+  << QString( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
 
   QTest::newRow( "is null" ) << QString(
     "<Filter>"

Original file line number	Diff line number	Diff line change
`@@ -1808,6 +1808,10 @@ QgsExpression::NodeBinaryOperator* QgsOgcUtils::nodeBinaryOperatorFromOgcFilter(`
`1808`	`1808`	`{`
`1809`	`1809`	`escape = element.attribute( "escape" );`
`1810`	`1810`	`}`
	`1811`	`+ else if ( element.hasAttribute( "escapeChar" ) )`
	`1812`	`+ {`
	`1813`	`+ escape = element.attribute( "escapeChar" );`
	`1814`	`+ }`
`1811`	`1815`	`// replace`
`1812`	`1816`	`QString oprValue = static_cast<const QgsExpression::NodeLiteral*>( opRight )->value().toString();`
`1813`	`1817`	`if ( !wildCard.isEmpty() && wildCard != "%" )`