- cut for 'probably last html-interface version': version number update

- small enhancement to ranking

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.4
 javacTarget=1.4
 
 # Release Configuration
-releaseVersion=0.461
+releaseVersion=0.462
 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}

source/de/anomic/plasma/plasmaSearchPreOrder.java

@@ -105,22 +105,26 @@ public final class plasmaSearchPreOrder {
     
     public void remove(boolean rootDomExt, boolean doubleDom) {
         // this removes all refererences to urls that are extended paths of existing 'RootDom'-urls
+        if (pageAcc.size() <= query.wantedResults) return;
         HashSet rootDoms = new HashSet();
         HashSet doubleDoms = new HashSet();
         Iterator i = pageAcc.entrySet().iterator();
         Map.Entry entry;
         indexEntry iEntry;
         String hashpart;
+        boolean isWordRootURL;
         while (i.hasNext()) {
             entry = (Map.Entry) i.next();
             iEntry = (indexEntry) entry.getValue();
             hashpart = iEntry.urlHash().substring(6);
-            if (((rootDomExt) && (rootDoms.contains(hashpart))) ||
+            isWordRootURL = indexURL.isWordRootURL(iEntry.urlHash(), query.words(""));
-                ((doubleDom) && (doubleDoms.contains(hashpart)))) {
+            if ((!(isWordRootURL)) &&
+                (((rootDomExt) && (rootDoms.contains(hashpart))) ||
+                 ((doubleDom) && (doubleDoms.contains(hashpart))))) {
                 i.remove();
                 if (pageAcc.size() <= query.wantedResults) return;
             } else {
-                if (indexURL.isWordRootURL(iEntry.urlHash(), query.words(""))) {
+                if (isWordRootURL) {
                     rootDoms.add(hashpart);
                 }
             }