Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unused network scanner parameter from queryparameter

Browse Source 
Search event is not using networkscanner 
(removed filterscannerfail param always init to false)
This commit is contained in:
reger 2015-12-13 02:50:08 +01:00
parent 7cda48a9d6
commit 020630efd8
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htroot/IndexControlRWIs_p.java
View File

@ -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);

2
htroot/yacy/search.java
View File

@ -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,

1
htroot/yacysearch.java
View File

@ -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);

3
source/net/yacy/cora/federate/FederateSearchManager.java
View File

@ -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);

4
source/net/yacy/search/query/QueryParams.java
View File

@ -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<String> 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;

9
source/net/yacy/search/query/SearchEvent.java
View File

@ -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)