boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

added the usage of synonyms to the GSA search interface

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent 3d33a5bdf6
commit f8a3ab2d82
5 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File

12
htroot/gsa/searchresult.java
Unescape View File

@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.regex.Pattern;
@ -35,6 +36,7 @@ import net.yacy.cora.protocol.RequestHeader;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.Switchboard;
import net.yacy.search.query.AccessTracker;
import net.yacy.search.query.QueryParams;
import net.yacy.search.query.SnippetProcess;
import net.yacy.server.serverObjects;
import net.yacy.server.serverSwitch;
@ -105,10 +107,11 @@ public class searchresult {
//post.put(, post.remove("client"));//required, example: myfrontend
//post.put(, post.remove("output"));//required, example: xml,xml_no_dtd
String q = post.get(CommonParams.Q, "");
post.put("originalQuery", q);
post.put(CommonParams.ROWS, post.remove("num"));
post.put(CommonParams.ROWS, Math.min(post.getInt(CommonParams.ROWS, 10), (authenticated) ? 5000 : 100));
post.put("hl", "true");
post.put("hl.fl", YaCySchema.h1_txt.name() + ","+ YaCySchema.h1_txt.name() + ","+ YaCySchema.text_t.name());
post.put("hl.fl", YaCySchema.h1_txt.name() + "," + YaCySchema.h2_txt.name() + "," + YaCySchema.text_t.name());
post.put("hl.alternateField", YaCySchema.description.name());
post.put("hl.simple.pre", "<b>");
post.put("hl.simple.post", "</b>");
@ -124,6 +127,10 @@ public class searchresult {
String access = post.remove("access");
String entqr = post.remove("entqr");
// get a solr query string
Collection<String>[] cq = QueryParams.cleanQuery(q);
q = QueryParams.solrQueryString(cq[0], cq[1], sb.index.fulltext().getSolrScheme()).toString();
// add sites operator
if (site != null && site.length() > 0) {
String[] s0 = site.split(Pattern.quote("|"));
@ -143,7 +150,8 @@ public class searchresult {
}
post.put(CommonParams.Q, q);
}
post.put(CommonParams.Q, q);
// get the embedded connector
EmbeddedSolrConnector connector = (EmbeddedSolrConnector) sb.index.fulltext().getLocalSolr();
if (connector == null) return null;

4
source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java
Unescape View File

@ -161,7 +161,7 @@ public class GSAResponseWriter implements QueryResponseWriter {
// write header
writer.write(XML_START);
String query = request.getParams().get("q");
String query = request.getParams().get("originalQuery");
String site = (String) context.get("site");
OpensearchResponseWriter.solitaireTag(writer, "TM", Long.toString(System.currentTimeMillis() - start));
OpensearchResponseWriter.solitaireTag(writer, "Q", query);
@ -170,7 +170,7 @@ public class GSAResponseWriter implements QueryResponseWriter {
paramTag(writer, "ie", "UTF-8");
paramTag(writer, "oe", "UTF-8");
paramTag(writer, "client", (String) context.get("client"));
paramTag(writer, "q", request.getParams().get("q"));
paramTag(writer, "q", query);
paramTag(writer, "site", site);
paramTag(writer, "start", Integer.toString(resHead.offset));
paramTag(writer, "num", Integer.toString(resHead.rows));

2
source/net/yacy/search/index/SolrConfiguration.java
Unescape View File

@ -879,7 +879,7 @@ public class SolrConfiguration extends ConfigurationSet implements Serializable
}
return a;
}
/**
* register an entry as error document
* @param digestURI

67
source/net/yacy/search/query/QueryParams.java
Unescape View File

@ -65,6 +65,7 @@ import net.yacy.kelondro.util.Bitfield;
import net.yacy.kelondro.util.SetTools;
import net.yacy.peers.Seed;
import net.yacy.search.index.Segment;
import net.yacy.search.index.SolrConfiguration;
import net.yacy.search.ranking.RankingProfile;
public final class QueryParams {
@ -469,7 +470,7 @@ public final class QueryParams {
final static YaCySchema[] fields = new YaCySchema[]{
YaCySchema.sku,YaCySchema.title,YaCySchema.h1_txt,YaCySchema.h2_txt,
YaCySchema.author,YaCySchema.description,YaCySchema.keywords,YaCySchema.text_t
YaCySchema.author,YaCySchema.description,YaCySchema.keywords,YaCySchema.text_t,YaCySchema.synonyms_sxt
};
final static Map<YaCySchema,Float> boosts = new LinkedHashMap<YaCySchema,Float>();
@ -499,34 +500,8 @@ public final class QueryParams {
public String solrQueryString() {
if (this.solrQueryString != null) return this.solrQueryString;
if (this.query_include_words == null || this.query_include_words.size() == 0) return null;
final StringBuilder q = new StringBuilder(80);
// add text query
int wc = 0;
StringBuilder w = new StringBuilder(80);
for (String s: this.query_include_words) {
if (wc > 0) w.append(" AND ");
w.append(s);
wc++;
}
for (String s: this.query_exclude_words){
if (wc > 0) w.append(" AND -");
w.append(s);
wc++;
}
// combine these queries for all relevant fields
wc = 0;
for (YaCySchema field: fields) {
if (wc > 0) q.append(" OR ");
q.append('(').append(field.name()).append(':').append(w).append(')');
wc++;
}
q.insert(0, '(');
q.append(')');
// add filter to prevent that results come from failed urls
q.append(" AND -").append(YaCySchema.failreason_t.name()).append(":[* TO *]");
// get text query
final StringBuilder q = solrQueryString(this.query_include_words, this.query_exclude_words, this.indexSegment.fulltext().getSolrScheme());
// add constraints
if ( this.sitehash == null ) {
@ -571,6 +546,40 @@ public final class QueryParams {
return this.solrQueryString;
}
public static StringBuilder solrQueryString(Collection<String> include, Collection<String> exclude, SolrConfiguration configuration) {
final StringBuilder q = new StringBuilder(80);
// add text query
int wc = 0;
StringBuilder w = new StringBuilder(80);
for (String s: include) {
if (wc > 0) w.append(" AND ");
w.append(s);
wc++;
}
for (String s: exclude){
if (wc > 0) w.append(" AND -");
w.append(s);
wc++;
}
// combine these queries for all relevant fields
wc = 0;
for (YaCySchema field: fields) {
if (configuration != null && !configuration.contains(field.name())) continue;
if (wc > 0) q.append(" OR ");
q.append('(').append(field.name()).append(':').append(w).append(')');
wc++;
}
q.insert(0, '(');
q.append(')');
// add filter to prevent that results come from failed urls
q.append(" AND -").append(YaCySchema.failreason_t.name()).append(":[* TO *]");
return q;
}
public String queryStringForUrl() {
try {
return URLEncoder.encode(this.queryString, "UTF-8");

2
source/net/yacy/server/serverObjects.java
Unescape View File

@ -472,7 +472,7 @@ public class serverObjects extends HashMap<String, String> implements Cloneable
public SolrParams toSolrParams(YaCySchema[] facets) {
// check if all required post fields are there
if (!this.containsKey(CommonParams.DF)) this.put(CommonParams.DF, YaCySchema.text_t.name()); // set default field to all fields
if (!this.containsKey(CommonParams.DF)) this.put(CommonParams.DF, YaCySchema.text_t.name()); // set default field to the text field
if (!this.containsKey(CommonParams.START)) this.put(CommonParams.START, "0"); // set default start item
if (!this.containsKey(CommonParams.ROWS)) this.put(CommonParams.ROWS, "10"); // set default number of search results

Write Preview
Loading…
Cancel
Save