Merge pull request #8816 from rldhont/sld-read-like-escapeChar-218

[BUGFIX] SLD : Support escapeChar attribute of PropertyIsLike
qgis · Jan 9, 2019 · b411f36 · b411f36
2 parents 86ff500 + 0ab834e
commit b411f36
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
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>"