[Exist-commits] SF.net SVN: exist: [6813] branches/meshram/eXist/extensions/indexes/ fulltext/src/org/exist/indexing/fulltext/FTIndexWorker.java

[<br...@us...>]

Revision: 6813
          http://exist.svn.sourceforge.net/exist/?rev=6813&view=rev
Author:   brihaye
Date:     2007-10-29 01:58:52 -0700 (Mon, 29 Oct 2007)

Log Message:
-----------
commiting unification stuff from last friday

Modified Paths:
--------------
    branches/meshram/eXist/extensions/indexes/fulltext/src/org/exist/indexing/fulltext/FTIndexWorker.java

Modified: branches/meshram/eXist/extensions/indexes/fulltext/src/org/exist/indexing/fulltext/FTIndexWorker.java
===================================================================
--- branches/meshram/eXist/extensions/indexes/fulltext/src/org/exist/indexing/fulltext/FTIndexWorker.java	2007-10-28 21:32:10 UTC (rev 6812)
+++ branches/meshram/eXist/extensions/indexes/fulltext/src/org/exist/indexing/fulltext/FTIndexWorker.java	2007-10-29 08:58:52 UTC (rev 6813)
@@ -629,6 +629,7 @@
             this.contextSet = contextSet;
             this.resultSet = result;
             this.qname = qname;
+            //Token should remain immutable
             this.token = new XMLString().append(token);
             this.returnAncestor = returnAncestor;
         }
@@ -643,7 +644,13 @@
                 LOG.error(e.getMessage(), e);
                 return true; 
             }         	
+        	/* this is the *incoming* token, not the searched one. Well, currently, it's an *exact* search ;-)
         	token.reuse();
+            if (qname == null)
+            	FTGenericTokenKey.decode(key, token);
+            else
+            	FTQNamedTokenKey.decode(key, token);
+            */
         	try {	        	
                 //Does the token already has data in the index ?		
 				while (is.available() > 0) {
@@ -789,8 +796,6 @@
             	FTQNamedTokenKey.decode(key, token);            
             try {
                 //Does the token already has data in the index ?
-                if (is == null)
-                    return true;
                 while (is.available() > 0) {
                     int storedDocId = is.readInt();
                     byte nameType = is.readByte();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.