From 020630efd842a77a927be2161169fe3099553ab2 Mon Sep 17 00:00:00 2001 From: reger Date: Sun, 13 Dec 2015 02:50:08 +0100 Subject: [PATCH] remove unused network scanner parameter from queryparameter Search event is not using networkscanner (removed filterscannerfail param always init to false) --- htroot/IndexControlRWIs_p.java | 1 - htroot/yacy/search.java | 2 -- htroot/yacysearch.java | 1 - source/net/yacy/cora/federate/FederateSearchManager.java | 3 +-- source/net/yacy/search/query/QueryParams.java | 4 +--- source/net/yacy/search/query/SearchEvent.java | 9 --------- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index 9830a02ab..31199063a 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/htroot/IndexControlRWIs_p.java @@ -660,7 +660,6 @@ public class IndexControlRWIs_p { sb.getRanking(), "",//userAgent false, - false, 0.0d, 0.0d, 0.0d, new String[0]); final SearchEvent theSearch = SearchEventCache.getEvent(query, sb.peers, sb.tables, null, false, sb.loader, Integer.MAX_VALUE, Long.MAX_VALUE); diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index dd050b86f..9b092792c 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -252,7 +252,6 @@ public final class search { rankingProfile, header.get(HeaderFramework.USER_AGENT, ""), false, - false, 0.0d, 0.0d, 0.0d, @@ -318,7 +317,6 @@ public final class search { rankingProfile, header.get(HeaderFramework.USER_AGENT, ""), false, - false, 0.0d, 0.0d, 0.0d, diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 0aea12e23..379ed2cb1 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -672,7 +672,6 @@ public class yacysearch { sb.getConfigBool(SwitchboardConstants.SEARCH_VERIFY_DELETE, false) && sb.getConfigBool(SwitchboardConstants.NETWORK_SEARCHVERIFY, false) && sb.peers.mySeed().getFlagAcceptRemoteIndex(), - false, lat, lon, rad, sb.getConfigArray("search.navigation", "")); EventTracker.delete(EventTracker.EClass.SEARCH); diff --git a/source/net/yacy/cora/federate/FederateSearchManager.java b/source/net/yacy/cora/federate/FederateSearchManager.java index bf370473f..bd17081c2 100644 --- a/source/net/yacy/cora/federate/FederateSearchManager.java +++ b/source/net/yacy/cora/federate/FederateSearchManager.java @@ -206,8 +206,7 @@ public class FederateSearchManager { sb.getRanking(), "",//userAgent false, - false, - 0.0, 0.0, -1.0, + 0.0d, 0.0d, -1.0d, new String[0]); return query(query); diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index e61b875bd..75a9ed1b1 100644 --- a/source/net/yacy/search/query/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -141,7 +141,7 @@ public final class QueryParams { public int transmitcount; // number of results that had been shown to the user public long searchtime, urlretrievaltime, snippetcomputationtime; // time to perform the search, to get all the urls, and to compute the snippets public final String userAgent; - protected boolean filterfailurls, filterscannerfail; + protected boolean filterfailurls; protected double lat, lon, radius; public LinkedHashSet facetfields; private SolrQuery cachedQuery; @@ -174,7 +174,6 @@ public final class QueryParams { final RankingProfile ranking, final String userAgent, final boolean filterfailurls, - final boolean filterscannerfail, final double lat, final double lon, final double radius, @@ -242,7 +241,6 @@ public final class QueryParams { this.userAgent = userAgent; this.transmitcount = 0; this.filterfailurls = filterfailurls; - this.filterscannerfail = filterscannerfail; // we normalize here the location and radius because that should cause a better caching // and as surplus it will increase privacy this.lat = Math.floor(lat * this.kmNormal) / this.kmNormal; diff --git a/source/net/yacy/search/query/SearchEvent.java b/source/net/yacy/search/query/SearchEvent.java index a93b112fa..83485c1a4 100644 --- a/source/net/yacy/search/query/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -58,7 +58,6 @@ import net.yacy.cora.federate.yacy.Distribution; import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.order.Base64Order; import net.yacy.cora.protocol.Domains; -import net.yacy.cora.protocol.Scanner; import net.yacy.cora.sorting.ClusteredScoreMap; import net.yacy.cora.sorting.ConcurrentScoreMap; import net.yacy.cora.sorting.ReversibleScoreMap; @@ -1266,14 +1265,6 @@ public final class SearchEvent { continue; } } - - // check Scanner - if (this.query.filterscannerfail && !Scanner.acceptURL(page.url())) { - if (log.isFine()) log.fine("dropped RWI: url not accepted by scanner"); - if (page.word().local()) this.local_rwi_available.decrementAndGet(); else this.remote_rwi_available.decrementAndGet(); - continue; - } - // check vocabulary terms (metatags) {only available in Solr index as vocabulary_xxyyzzz_sxt field} // TODO: vocabulary is only valid and available in local Solr index (consider to auto-switch to Searchdom.LOCAL)