[BUGFIX] SLD : Support escapeChar attribute of PropertyIsLike

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.
qgis · Jan 16, 2019 · 356bc38 · 356bc38
1 parent 5ff59ce
commit 356bc38
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -3206,6 +3206,10 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodeBinaryOper
       {
         escape = element.attribute( QStringLiteral( "escape" ) );
       }
+      if ( element.hasAttribute( QStringLiteral( "escapeChar" ) ) )
+      {
+        escape = element.attribute( QStringLiteral( "escapeChar" ) );
+      }
       // replace
       QString oprValue = static_cast<const QgsExpressionNodeLiteral *>( opRight.get() )->value().toString();
       if ( !wildCard.isEmpty() && wildCard != QLatin1String( "%" ) )

diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
@@ -396,14 +396,21 @@ void TestQgsOgcUtils::testExpressionFromOgcFilter_data()
                                         "<PropertyName>NAME</PropertyName><Literal>._QGIS.\\.</Literal></PropertyIsLike>"
                                         "</Filter>" )
                                       << QStringLiteral( "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>" )
                                       << QStringLiteral( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
 
+  QTest::newRow( "like escape char" ) << QString(
+                                        "<Filter>"
+                                        "<PropertyIsLike wildCard=\"*\" singleChar=\".\" escapeChar=\"!\">"
+                                        "<PropertyName>NAME</PropertyName><Literal>_QGIS.!.!!%QGIS*!*</Literal></PropertyIsLike>"
+                                        "</Filter>" )
+                                      << QStringLiteral( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
+
   QTest::newRow( "is null" ) << QString(
                                "<Filter>"
                                "<ogc:PropertyIsNull>"