Restored quick search behaviour (#2407) - was a side effect when fixing #2007

wonder · wonder · commit 492f0189a35c · 2010-03-28T10:13:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13179 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -320,15 +320,21 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
         return false;
       }
 
+      // TODO: reuse QRegExp
+
       QString str = value2.string();
       if ( mOp == opLike ) // change from LIKE syntax to regexp
       {
         // XXX escape % and _  ???
         str.replace( "%", ".*" );
         str.replace( "_", "." );
+        return QRegExp( str ).exactMatch( value1.string() );
+      }
+      else
+      {
+        return ( QRegExp( str ).indexIn( value1.string() ) != -1 );
       }
 
-      return QRegExp( str ).exactMatch( value1.string() );
     }
 
     default:

Original file line number	Diff line number	Diff line change
`@@ -320,15 +320,21 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib`
`320`	`320`	`return false;`
`321`	`321`	`}`
`322`	`322`
	`323`	`+ // TODO: reuse QRegExp`
	`324`	`+`
`323`	`325`	`QString str = value2.string();`
`324`	`326`	`if ( mOp == opLike ) // change from LIKE syntax to regexp`
`325`	`327`	`{`
`326`	`328`	`// XXX escape % and _ ???`
`327`	`329`	`str.replace( "%", ".*" );`
`328`	`330`	`str.replace( "_", "." );`
	`331`	`+ return QRegExp( str ).exactMatch( value1.string() );`
	`332`	`+ }`
	`333`	`+ else`
	`334`	`+ {`
	`335`	`+ return ( QRegExp( str ).indexIn( value1.string() ) != -1 );`
`329`	`336`	`}`
`330`	`337`
`331`		`- return QRegExp( str ).exactMatch( value1.string() );`
`332`	`338`	`}`
`333`	`339`
`334`	`340`	`default:`