fix #2007

jef · jef · commit 2e1eb256b3d6 · 2009-10-14T11:52:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11804 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -251,7 +251,8 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
     case opRegexp:
     case opLike:
     {
-      if ( !getValue( value1, mLeft, fields, attributes ) || !getValue( value2, mRight, fields, attributes ) )
+      if ( !getValue( value1, mLeft, fields, attributes ) ||
+				   !getValue( value2, mRight, fields, attributes ) )
         return false;
 
       // value1 is string to be matched
@@ -274,10 +275,10 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
       }
 
       QRegExp re( str );
-      res = re.indexIn( value1.string() );
+			res = re.exactMatch( value1.string() );
       QgsDebugMsgLevel( "REGEXP: " + str + " ~ " + value2.string(), 2 );
       QgsDebugMsgLevel( "   res: " + res, 2 );
-      return ( res != -1 );
+      return res;
     }
 
     default:

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,8 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib`
`251`	`251`	`case opRegexp:`
`252`	`252`	`case opLike:`
`253`	`253`	`{`
`254`		`- if ( !getValue( value1, mLeft, fields, attributes ) \|\| !getValue( value2, mRight, fields, attributes ) )`
	`254`	`+ if ( !getValue( value1, mLeft, fields, attributes ) \|\|`
	`255`	`+ !getValue( value2, mRight, fields, attributes ) )`
`255`	`256`	`return false;`
`256`	`257`
`257`	`258`	`// value1 is string to be matched`
`@@ -274,10 +275,10 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`QRegExp re( str );`
`277`		`- res = re.indexIn( value1.string() );`
	`278`	`+ res = re.exactMatch( value1.string() );`
`278`	`279`	`QgsDebugMsgLevel( "REGEXP: " + str + " ~ " + value2.string(), 2 );`
`279`	`280`	`QgsDebugMsgLevel( " res: " + res, 2 );`
`280`		`- return ( res != -1 );`
	`281`	`+ return res;`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`default:`