Merge pull request #1210 from marcel-dancak/master

mhugent · mhugent · commit 3f5e8835ec6b · 2014-02-21T16:19:13.000+01:00
Allow LIKE operator in QGIS mapserver's GetFeatureInfo FILTER parameter
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -2000,6 +2000,7 @@ bool QgsWMSServer::testFilterStringSafety( const QString& filter ) const
          || tokenIt->compare( "AND", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "OR", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "IN", Qt::CaseInsensitive ) == 0
+         || tokenIt->compare( "LIKE", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "DMETAPHONE", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "SOUNDEX", Qt::CaseInsensitive ) == 0 )
     {

Original file line number	Diff line number	Diff line change
`@@ -2000,6 +2000,7 @@ bool QgsWMSServer::testFilterStringSafety( const QString& filter ) const`
`2000`	`2000`	`\|\| tokenIt->compare( "AND", Qt::CaseInsensitive ) == 0`
`2001`	`2001`	`\|\| tokenIt->compare( "OR", Qt::CaseInsensitive ) == 0`
`2002`	`2002`	`\|\| tokenIt->compare( "IN", Qt::CaseInsensitive ) == 0`
	`2003`	`+ \|\| tokenIt->compare( "LIKE", Qt::CaseInsensitive ) == 0`
`2003`	`2004`	`\|\| tokenIt->compare( "DMETAPHONE", Qt::CaseInsensitive ) == 0`
`2004`	`2005`	`\|\| tokenIt->compare( "SOUNDEX", Qt::CaseInsensitive ) == 0 )`
`2005`	`2006`	`{`