fixes

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

htroot/yacysearchtrailer.java

@@ -29,7 +29,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import de.anomic.http.httpRequestHeader;
-import de.anomic.kelondro.order.NaturalOrder;
 import de.anomic.kelondro.util.SetTools;
 import de.anomic.plasma.plasmaProfiling;
 import de.anomic.plasma.plasmaSearchEvent;
@@ -65,7 +64,7 @@ public class yacysearchtrailer {
         final Set<String> references = theSearch.references(20);
         if (references.size() > 0) {
             // get the topwords
-            final TreeSet<String> topwords = new TreeSet<String>(NaturalOrder.naturalComparator);
+            final TreeSet<String> topwords = new TreeSet<String>();
             String tmp = "";
             final Iterator<String> i = references.iterator();
             while (i.hasNext()) {

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

@@ -281,7 +281,7 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu
         }
         
         // clean-up the cache
-        if (this.array.size() < 50 && this.lastCleanup + cleanupCycle > System.currentTimeMillis()) return;
+        if (this.array.entries() < 50 && (this.lastCleanup + cleanupCycle > System.currentTimeMillis())) return;
         //System.out.println("----cleanup check");
         this.array.shrink(this.targetFileSize, this.maxFileSize);
         this.lastCleanup = System.currentTimeMillis();

source/de/anomic/plasma/plasmaSearchQuery.java

@@ -30,7 +30,6 @@ import de.anomic.htmlFilter.htmlFilterAbstractScraper;
 import de.anomic.htmlFilter.htmlFilterCharacterCoding;
 import de.anomic.kelondro.order.Base64Order;
 import de.anomic.kelondro.order.Bitfield;
-import de.anomic.kelondro.order.NaturalOrder;
 import de.anomic.kelondro.util.SetTools;
 import de.anomic.plasma.parser.Word;
 import de.anomic.plasma.parser.Condenser;
@@ -253,9 +252,9 @@ public final class plasmaSearchQuery {
     @SuppressWarnings("unchecked")
     public static TreeSet<String>[] cleanQuery(String querystring) {
         // returns three sets: a query set, a exclude set and a full query set
-        final TreeSet<String> query = new TreeSet<String>(NaturalOrder.naturalComparator);
-        final TreeSet<String> exclude = new TreeSet<String>(NaturalOrder.naturalComparator);
-        final TreeSet<String> fullquery = new TreeSet<String>(NaturalOrder.naturalComparator);
+        final TreeSet<String> query = new TreeSet<String>();
+        final TreeSet<String> exclude = new TreeSet<String>();
+        final TreeSet<String> fullquery = new TreeSet<String>();
         
         if ((querystring == null) || (querystring.length() == 0)) return new TreeSet[]{query, exclude, fullquery};