diff --git a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java index abaa9ffe8..efc5e7bdc 100644 --- a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java @@ -288,7 +288,8 @@ public abstract class AbstractSolrConnector implements SolrConnector { params.setFacet(false); if (fields.length > 0) params.setFields(fields); params.setIncludeScore(false); - + params.setParam("defType", "edismax"); + params.setParam("qf", CollectionSchema.text_t.getSolrFieldName() + "^1.0"); return params; } diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index 60599232b..ae9a6354a 100644 --- a/source/net/yacy/search/query/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -400,6 +400,7 @@ public final class QueryParams { private SolrQuery getBasicParams(boolean getFacets) { final SolrQuery params = new SolrQuery(); params.setParam("defType", "edismax"); + params.setParam("qf", CollectionSchema.text_t.getSolrFieldName() + "^1.0"); params.setStart(this.offset); params.setRows(this.itemsPerPage); params.setFacet(false); diff --git a/source/net/yacy/search/schema/CollectionConfiguration.java b/source/net/yacy/search/schema/CollectionConfiguration.java index 2c6108604..519bab1b9 100644 --- a/source/net/yacy/search/schema/CollectionConfiguration.java +++ b/source/net/yacy/search/schema/CollectionConfiguration.java @@ -1422,17 +1422,18 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri continue uniquecheck; } try { - long doccount = segment.fulltext().getDefaultConnector().getCountByQuery( + String doccountquery = CollectionSchema.host_id_s.getSolrFieldName() + ":\"" + hostid + "\" AND " + "-" + CollectionSchema.robots_i.getSolrFieldName() + ":8 AND " + // bit 3 "-" + CollectionSchema.robots_i.getSolrFieldName() + ":24 AND " + // bit 3 + 4 "-" + CollectionSchema.robots_i.getSolrFieldName() + ":512 AND " + // bit 9 "-" + CollectionSchema.robots_i.getSolrFieldName() + ":1536 AND " + // bit 9 + 10 - "(-" + CollectionSchema.canonical_equal_sku_b.getSolrFieldName() + ":[* TO *] OR " + CollectionSchema.canonical_equal_sku_b.getSolrFieldName() + ":true ) AND " + + "((-" + CollectionSchema.canonical_equal_sku_b.getSolrFieldName() + ":[* TO *]) OR (" + CollectionSchema.canonical_equal_sku_b.getSolrFieldName() + ":true)) AND " + CollectionSchema.httpstatus_i.getSolrFieldName() + ":200 AND " + "-" + CollectionSchema.id.getSolrFieldName() + ":\"" + urlhash + "\" AND " + - signaturefield.getSolrFieldName() + ":\"" + signature.toString() + "\""); - sid.setField(uniquefield.getSolrFieldName(), doccount == 0); + signaturefield.getSolrFieldName() + ":\"" + signature.toString() + "\""; + long doccount = segment.fulltext().getDefaultConnector().getCountByQuery(doccountquery); + sid.setField(uniquefield.getSolrFieldName(), doccount == 0); } catch (final IOException e) {} } }