diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index 730d85bcd..13a6757aa 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -243,7 +243,7 @@ public final class search { indexSegment, rankingProfile, header.get(RequestHeader.USER_AGENT, ""), - false, 0.0d, 0.0d, 0.0d + false, false, 0.0d, 0.0d, 0.0d ); Network.log.logInfo("INIT HASH SEARCH (abstracts only): " + QueryParams.anonymizedQueryHashes(theQuery.getQueryGoal().getIncludeHashes()) + " - " + theQuery.itemsPerPage() + " links"); @@ -305,7 +305,7 @@ public final class search { sb.index, rankingProfile, header.get(RequestHeader.USER_AGENT, ""), - false, 0.0d, 0.0d, 0.0d + false, false, 0.0d, 0.0d, 0.0d ); Network.log.logInfo("INIT HASH SEARCH (query-" + abstracts + "): " + QueryParams.anonymizedQueryHashes(theQuery.getQueryGoal().getIncludeHashes()) + " - " + theQuery.itemsPerPage() + " links"); EventChannel.channels(EventChannel.REMOTESEARCH).addMessage(new RSSMessage("Remote Search Request from " + ((remoteSeed == null) ? "unknown" : remoteSeed.getName()), QueryParams.anonymizedQueryHashes(theQuery.getQueryGoal().getIncludeHashes()), "")); diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 3b02586fb..06eeda3ef 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -730,6 +730,7 @@ public class yacysearch { sb.getConfigBool(SwitchboardConstants.SEARCH_VERIFY_DELETE, false) && sb.getConfigBool(SwitchboardConstants.NETWORK_SEARCHVERIFY, false) && sb.peers.mySeed().getFlagAcceptRemoteIndex(), + false, lat, lon, rad); EventTracker.delete(EventTracker.EClass.SEARCH); EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch( diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index 80d74e3ea..62197ab44 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; + protected boolean filterfailurls, filterscannerfail; protected double lat, lon, radius; public List facetfields; public int maxfacets; @@ -196,6 +196,7 @@ public final class QueryParams { this.userAgent = userAgent; this.transmitcount = 0; this.filterfailurls = false; + this.filterscannerfail = false; this.lat = 0.0d; this.lon = 0.0d; this.radius = 0.0d; @@ -234,6 +235,7 @@ 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) { this.queryGoal = queryGoal; this.modifier = new Modifier(modifier == null ? "" : modifier); @@ -292,6 +294,7 @@ 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 e82f05fd3..697bfb525 100644 --- a/source/net/yacy/search/query/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -834,7 +834,7 @@ public final class SearchEvent { } // check Scanner - if ( !Scanner.acceptURL(page.url()) ) { + if (this.query.filterscannerfail && !Scanner.acceptURL(page.url())) { this.query.misses.add(page.hash()); continue; }