diff --git a/build.properties b/build.properties index 106dcf372..b19c1e7cd 100644 --- a/build.properties +++ b/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} diff --git a/source/de/anomic/plasma/plasmaSearchPreOrder.java b/source/de/anomic/plasma/plasmaSearchPreOrder.java index 669d0c774..f595a29a9 100644 --- a/source/de/anomic/plasma/plasmaSearchPreOrder.java +++ b/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))) || - ((doubleDom) && (doubleDoms.contains(hashpart)))) { + isWordRootURL = indexURL.isWordRootURL(iEntry.urlHash(), query.words("")); + 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); } }