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

removed tenant query attribute since it is not used any more and is

Browse Source 
replaced by the site-operator in the GSA interface. This operator can
also be simulated in the Solr interface using the collections_sxt field.
This commit is contained in:
Michael Peter Christen 2012-09-25 21:09:06 +02:00
parent 872f83ebe0
commit e49359cc95
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htroot/yacy/search.java
View File

@ -225,7 +225,6 @@ public final class search {
abstractSet,
new RowHandleSet(WordReferenceRow.urlEntryRow.primaryKeyLength, WordReferenceRow.urlEntryRow.objectOrder, 0),
abstractSet,
null,
modifier,
maxdist,
prefer,
@ -291,7 +290,6 @@ public final class search {
queryhashes,
excludehashes,
allHashes,
null,
modifier,
maxdist,
prefer,

16
htroot/yacysearch.java
View File

@ -499,21 +499,6 @@ public class yacysearch {
}
}
String tenant = null;
if ( post.containsKey("tenant") ) {
tenant = post.get("tenant");
if ( tenant != null && tenant.isEmpty() ) {
tenant = null;
}
if ( tenant != null ) {
if ( urlmask == null ) {
urlmask = ".*" + tenant + ".*";
} else {
urlmask = ".*" + tenant + urlmask;
}
}
}
final int site = querystring.indexOf("site:", 0);
String sitehash = null;
String sitehost = null;
@ -746,7 +731,6 @@ public class yacysearch {
Word.words2hashesHandles(query[0]),
Word.words2hashesHandles(query[1]),
Word.words2hashesHandles(query[2]),
tenant,
modifier.toString().trim(),
maxDistance,
prefermask,

1
source/net/yacy/cora/services/federated/solr/connector/ShardSolrConnector.java
View File

@ -32,7 +32,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.services.federated.solr.connector.ShardSelection.Method;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;

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

@ -132,7 +132,6 @@ public final class QueryParams {
public final String sitehash; // this is a domain hash, 6 bytes long or null
public final Set<String> siteexcludes; // set of domain hashes that are excluded if not included by sitehash
public final String authorhash;
public final String tenant;
public final Modifier modifier;
public Seed remotepeer;
public final long starttime, maxtime, timeout; // the time when the query started, how long it should take and the time when the timeout is reached (milliseconds)
@ -178,7 +177,6 @@ public final class QueryParams {
this.query_all_hashes = Word.words2hashesHandles(cq[2]);
}
this.ranking = ranking;
this.tenant = null;
this.modifier = new Modifier("");
this.maxDistance = Integer.MAX_VALUE;
this.urlMask = catchall_pattern;
@ -223,7 +221,6 @@ public final class QueryParams {
final HandleSet queryHashes,
final HandleSet excludeHashes,
final HandleSet fullqueryHashes,
final String tenant,
final String modifier,
final int maxDistance, final String prefer, final ContentDomain contentdom,
final String language,
@ -252,7 +249,6 @@ public final class QueryParams {
this.query_include_hashes = queryHashes;
this.query_exclude_hashes = excludeHashes;
this.query_all_hashes = fullqueryHashes;
this.tenant = (tenant != null && tenant.isEmpty()) ? null : tenant;
this.modifier = new Modifier(modifier == null ? "" : modifier);
this.ranking = ranking;
this.maxDistance = maxDistance;