fixes in connection with transiton to byte[] hashes

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5843 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/yacysearch.java

@@ -395,7 +395,7 @@ public class yacysearch {
             theQuery.filterOut(plasmaSwitchboard.blueList);
             
             // log
-            Log.logInfo("LOCAL_SEARCH", "INIT WORD SEARCH: " + theQuery.queryString + ":" + theQuery.queryHashes + " - " + theQuery.neededResults() + " links to be computed, " + theQuery.displayResults() + " lines to be displayed");
+            Log.logInfo("LOCAL_SEARCH", "INIT WORD SEARCH: " + theQuery.queryString + ":" + plasmaSearchQuery.hashSet2hashString(theQuery.queryHashes) + " - " + theQuery.neededResults() + " links to be computed, " + theQuery.displayResults() + " lines to be displayed");
             RSSFeed.channels(RSSFeed.LOCALSEARCH).addMessage(new RSSMessage("Local Search Request", theQuery.queryString, ""));
             final long timestamp = System.currentTimeMillis();
 

source/de/anomic/kelondro/text/AbstractBufferedIndex.java

@@ -39,10 +39,11 @@ public abstract class AbstractBufferedIndex<ReferenceType extends Reference> ext
         super(factory);
     }
     
-    public synchronized TreeSet<ReferenceContainer<ReferenceType>> references(final byte[] startHash, final boolean rot, int count, boolean ram) throws IOException {
+    public synchronized TreeSet<ReferenceContainer<ReferenceType>> references(byte[] startHash, final boolean rot, int count, boolean ram) throws IOException {
         // creates a set of indexContainers
         // this does not use the cache
         final Order<ReferenceContainer<ReferenceType>> containerOrder = new ReferenceContainerOrder<ReferenceType>(factory, this.ordering().clone());
+        if (startHash.length == 0) startHash = null;
         ReferenceContainer<ReferenceType> emptyContainer = ReferenceContainer.emptyContainer(factory, startHash, 0);
         containerOrder.rotate(emptyContainer);
         final TreeSet<ReferenceContainer<ReferenceType>> containers = new TreeSet<ReferenceContainer<ReferenceType>>(containerOrder);

source/de/anomic/kelondro/text/ReferenceContainerCache.java

@@ -318,8 +318,9 @@ public final class ReferenceContainerCache<ReferenceType extends Reference> exte
         private final boolean rot;
         private Iterator<ReferenceContainer<ReferenceType>> iterator;
         
-        public heapCacheIterator(final byte[] startWordHash, final boolean rot) {
+        public heapCacheIterator(byte[] startWordHash, final boolean rot) {
             this.rot = rot;
+            if (startWordHash.length == 0) startWordHash = null;
             this.iterator = (startWordHash == null) ? cache.values().iterator() : cache.tailMap(startWordHash).values().iterator();
             // The collection's iterator will return the values in the order that their corresponding keys appear in the tree.
         }

source/de/anomic/plasma/parser/Word.java

@@ -85,6 +85,8 @@ public class Word {
         byte[] h = hashCache.get(word);
         if (h != null) return h;
         h = Base64Order.enhancedCoder.encodeSubstring(Digest.encodeMD5Raw(word.toLowerCase(Locale.ENGLISH)), yacySeedDB.commonHashLength);
+        assert h[2] != '@';
+        String s = new String(h);
         hashCache.put(word, h); // prevent expensive MD5 computation and encoding
         return h;
     }