Change sqlite fts2 tokenizer to recognize "foo*" as a prefix search, and not

"foo *".
Review URL: http://codereview.chromium.org/14176

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7115 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/third_party/sqlite/fts2.c b/third_party/sqlite/fts2.c
index d882b4f..15ed0b5 100644
--- a/third_party/sqlite/fts2.c
+++ b/third_party/sqlite/fts2.c
@@ -3538,6 +3538,7 @@ static int tokenizeSegment(
   int firstIndex = pQuery->nTerms;
   int iCol;
   int nTerm = 1;
+  int iEndLast = -1;
   
   int rc = pModule->xOpen(pTokenizer, pSegment, nSegment, &pCursor);
   if( rc!=SQLITE_OK ) return rc;
@@ -3566,12 +3567,13 @@ static int tokenizeSegment(
     // If a tokenizer recognizes "*" as a separate word, we mark the word
     // before it as a prefix search.  The other isPrefix code below that tests
     // for a word that's tokenized with the star as its last character.
-    // TODO(evanm): this is incorrect in that "foo *" parses as "foo*".
-    if( pQuery->nTerms>0 && nToken==1 && pSegment[iBegin]=='*' ){
+    if( pQuery->nTerms>0 && nToken==1 && pSegment[iBegin]=='*' &&
+        iEndLast==iBegin){
       pQuery->pTerms[pQuery->nTerms-1].isPrefix = 1;
       continue;
     }
-    
+    iEndLast = iEnd;
+
     queryAdd(pQuery, pToken, nToken);
     if( !inPhrase && iBegin>0 && pSegment[iBegin-1]=='-' ){
       pQuery->pTerms[pQuery->nTerms-1].isNot = 1;