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

Introduce keyword query parameter

Browse Source 
This enables keyword navigator to filter on keywords. Added search page
output and layout config for keywords, allowing e.g. in Intranet use
to display the keywords. No styling or links applied to the keyword
text (but is desirable possibly in combination with bootstrap-tagsinput
for future/intranet).
pull/122/head
reger 8 years ago
parent cbccf97361
commit a814f3d885
10 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File

1
defaults/yacy.init
Unescape View File

@ -851,6 +851,7 @@ search.result.noreferrer=false
# search result lines may show additional information for each search hit # search result lines may show additional information for each search hit
# these information pieces may be switched on or off # these information pieces may be switched on or off
search.result.show.keywords = false
search.result.show.date = true search.result.show.date = true
search.result.show.size = false search.result.show.size = false
search.result.show.metadata = false search.result.show.metadata = false

5
htroot/ConfigSearchPage_p.html
Unescape View File

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" media="screen" href="env/highslide.css" /> <link rel="stylesheet" type="text/css" media="screen" href="env/highslide.css" />
<script type="text/javascript" src="js/yacysearch.js"></script> <script type="text/javascript" src="js/yacysearch.js"></script>
<script type="text/javascript" src="js/highslide/highslide.js"></script> <script type="text/javascript" src="js/highslide/highslide.js"></script>
<script src="yacy/ui/js/jquery.tagcloud.js" type="text/javascript"></script> <script type="text/javascript" src="yacy/ui/js/jquery.tagcloud.js"></script>
</head> </head>
<body id="ConfigSearchPage" > <body id="ConfigSearchPage" >
@ -224,6 +224,9 @@ var solr= $.getJSON("solr/collection1/select?q=*:*&defType=edismax&start=0&rows=
<p class="url"> <p class="url">
<a href="yacysearch.html" id="urlhash" target="LayouTest">http://url-of-the-search-result.net</a> <a href="yacysearch.html" id="urlhash" target="LayouTest">http://url-of-the-search-result.net</a>
</p> </p>
<p>
<input type="checkbox" name="search.result.show.keywords" value="true" #(search.result.show.keywords)#::checked="checked" #(/search.result.show.keywords)# /> Tags: keyword subject keyword2 keyword3
</p>
<p class="urlinfo"> <p class="urlinfo">
<table border="0"> <table border="0">
<tr> <tr>

3
htroot/ConfigSearchPage_p.java
Unescape View File

@ -72,6 +72,7 @@ public class ConfigSearchPage_p {
sb.setConfig("search.video", post.getBoolean("search.video")); sb.setConfig("search.video", post.getBoolean("search.video"));
sb.setConfig("search.app", post.getBoolean("search.app")); sb.setConfig("search.app", post.getBoolean("search.app"));
sb.setConfig("search.result.show.keywords", post.getBoolean("search.result.show.keywords"));
sb.setConfig("search.result.show.date", post.getBoolean("search.result.show.date")); sb.setConfig("search.result.show.date", post.getBoolean("search.result.show.date"));
sb.setConfig("search.result.show.size", post.getBoolean("search.result.show.size")); sb.setConfig("search.result.show.size", post.getBoolean("search.result.show.size"));
sb.setConfig("search.result.show.metadata", post.getBoolean("search.result.show.metadata")); sb.setConfig("search.result.show.metadata", post.getBoolean("search.result.show.metadata"));
@ -156,6 +157,7 @@ public class ConfigSearchPage_p {
sb.setConfig("search.audio", config.getProperty("search.audio","false")); sb.setConfig("search.audio", config.getProperty("search.audio","false"));
sb.setConfig("search.video", config.getProperty("search.video","false")); sb.setConfig("search.video", config.getProperty("search.video","false"));
sb.setConfig("search.app", config.getProperty("search.app","false")); sb.setConfig("search.app", config.getProperty("search.app","false"));
sb.setConfig("search.result.show.keywords", config.getProperty("search.result.show.keywords","false"));
sb.setConfig("search.result.show.date", config.getProperty("search.result.show.date","true")); sb.setConfig("search.result.show.date", config.getProperty("search.result.show.date","true"));
sb.setConfig("search.result.show.size", config.getProperty("search.result.show.size","false")); sb.setConfig("search.result.show.size", config.getProperty("search.result.show.size","false"));
sb.setConfig("search.result.show.metadata", config.getProperty("search.result.show.metadata","false")); sb.setConfig("search.result.show.metadata", config.getProperty("search.result.show.metadata","false"));
@ -184,6 +186,7 @@ public class ConfigSearchPage_p {
prop.put("search.video", sb.getConfigBool("search.video", false) ? 1 : 0); prop.put("search.video", sb.getConfigBool("search.video", false) ? 1 : 0);
prop.put("search.app", sb.getConfigBool("search.app", false) ? 1 : 0); prop.put("search.app", sb.getConfigBool("search.app", false) ? 1 : 0);
prop.put("search.result.show.keywords", sb.getConfigBool("search.result.show.keywords", false) ? 1 : 0);
prop.put("search.result.show.date", sb.getConfigBool("search.result.show.date", false) ? 1 : 0); prop.put("search.result.show.date", sb.getConfigBool("search.result.show.date", false) ? 1 : 0);
prop.put("search.result.show.size", sb.getConfigBool("search.result.show.size", false) ? 1 : 0); prop.put("search.result.show.size", sb.getConfigBool("search.result.show.size", false) ? 1 : 0);
prop.put("search.result.show.metadata", sb.getConfigBool("search.result.show.metadata", false) ? 1 : 0); prop.put("search.result.show.metadata", sb.getConfigBool("search.result.show.metadata", false) ? 1 : 0);

2
htroot/index.html
Unescape View File

@ -161,6 +161,8 @@
<dt>from:&lt;date1&gt; to:&lt;date2&gt;</dt> <dt>from:&lt;date1&gt; to:&lt;date2&gt;</dt>
<dd>only pages with a date between &lt;date1&gt; and &lt;date2&gt; in content</dd> <dd>only pages with a date between &lt;date1&gt; and &lt;date2&gt; in content</dd>
#(/datesincontent)# #(/datesincontent)#
<dt>keyword:&lt;phrase&gt;</dt>
<dd>only pages with keyword anotation containing &lt;phrase&gt;</dd>
<dt>/http</dt> <dt>/http</dt>
<dd>only resources from http or https servers</dd> <dd>only resources from http or https servers</dd>
<dt>/ftp</dt> <dt>/ftp</dt>

1
htroot/yacysearchitem.html
Unescape View File

@ -25,6 +25,7 @@
</div> </div>
<p class="snippet"><span class="snippetLoaded" id="h#[urlhash]#">#[description]#</span></p> <p class="snippet"><span class="snippetLoaded" id="h#[urlhash]#">#[description]#</span></p>
<p class="url"><a href="#[link]#" id="url#[urlhash]#" target="#[target]#" #(noreferrer)#::rel="noreferrer"#(/noreferrer)#>#[urlname]#</a></p> <p class="url"><a href="#[link]#" id="url#[urlhash]#" target="#[target]#" #(noreferrer)#::rel="noreferrer"#(/noreferrer)#>#[urlname]#</a></p>
#(showKeywords)#::<p class="tags">Tags: #[subject]#</p>#(/showKeywords)#
<p class="urlinfo"> <p class="urlinfo">
#(showDate)#::#[date]##(/showDate)# #(showDate)#::#[date]##(/showDate)#
#(showEvent)#::on #[date]##(/showEvent)# #(showEvent)#::on #[date]##(/showEvent)#

2
htroot/yacysearchitem.java
Unescape View File

@ -205,6 +205,7 @@ public class yacysearchitem {
prop.put("content_showEvent", showEvent ? 1 : 0); prop.put("content_showEvent", showEvent ? 1 : 0);
Collection<File> snapshotPaths = sb.getConfigBool("search.result.show.snapshots", true) ? Transactions.findPaths(result.url(), null, State.ANY) : null; Collection<File> snapshotPaths = sb.getConfigBool("search.result.show.snapshots", true) ? Transactions.findPaths(result.url(), null, State.ANY) : null;
if (fileType == FileType.HTML) { // html template specific settings if (fileType == FileType.HTML) { // html template specific settings
prop.put("content_showKeywords", (sb.getConfigBool("search.result.show.keywords", false) && !result.dc_subject().isEmpty()) ? 1 : 0);
prop.put("content_showDate", sb.getConfigBool("search.result.show.date", true) && !showEvent ? 1 : 0); prop.put("content_showDate", sb.getConfigBool("search.result.show.date", true) && !showEvent ? 1 : 0);
prop.put("content_showSize", sb.getConfigBool("search.result.show.size", true) ? 1 : 0); prop.put("content_showSize", sb.getConfigBool("search.result.show.size", true) ? 1 : 0);
prop.put("content_showMetadata", sb.getConfigBool("search.result.show.metadata", true) ? 1 : 0); prop.put("content_showMetadata", sb.getConfigBool("search.result.show.metadata", true) ? 1 : 0);
@ -219,6 +220,7 @@ public class yacysearchitem {
prop.put("content_showRanking", sb.getConfigBool("search.result.show.ranking", false) ? 1 : 0); prop.put("content_showRanking", sb.getConfigBool("search.result.show.ranking", false) ? 1 : 0);
if (showEvent) prop.put("content_showEvent_date", GenericFormatter.RFC1123_SHORT_FORMATTER.format(events[0])); if (showEvent) prop.put("content_showEvent_date", GenericFormatter.RFC1123_SHORT_FORMATTER.format(events[0]));
prop.putHTML("content_showKeywords_subject", result.dc_subject());
prop.put("content_showDate_date", GenericFormatter.RFC1123_SHORT_FORMATTER.format(result.moddate())); prop.put("content_showDate_date", GenericFormatter.RFC1123_SHORT_FORMATTER.format(result.moddate()));
prop.putHTML("content_showSize_sizename", RSSMessage.sizename(result.filesize())); prop.putHTML("content_showSize_sizename", RSSMessage.sizename(result.filesize()));
prop.put("content_showMetadata_urlhash", urlhash); prop.put("content_showMetadata_urlhash", urlhash);

3
source/net/yacy/search/navigator/StringNavigator.java
Unescape View File

@ -68,6 +68,9 @@ public class StringNavigator extends ConcurrentScoreMap<String> implements Navi
mod = "author:" + key; mod = "author:" + key;
} }
break; break;
case keywords:
mod = "keyword:" + key;
break;
case url_protocol_s: case url_protocol_s:
mod = "/" + key; mod = "/" + key;
break; break;

21
source/net/yacy/search/query/QueryModifier.java
Unescape View File

@ -40,7 +40,7 @@ import net.yacy.server.serverObjects;
public class QueryModifier { public class QueryModifier {
private final StringBuilder modifier; private final StringBuilder modifier;
public String sitehost, sitehash, filetype, protocol, language, author, collection, on, from, to; public String sitehost, sitehash, filetype, protocol, language, author, keyword, collection, on, from, to;
public int timezoneOffset; public int timezoneOffset;
public QueryModifier(final int timezoneOffset) { public QueryModifier(final int timezoneOffset) {
@ -51,6 +51,7 @@ public class QueryModifier {
this.protocol = null; this.protocol = null;
this.language = null; this.language = null;
this.author = null; this.author = null;
this.keyword = null;
this.collection = null; this.collection = null;
this.on = null; this.on = null;
this.from = null; this.from = null;
@ -145,7 +146,17 @@ public class QueryModifier {
add("author:" + author); add("author:" + author);
} }
} }
// parse keyword
final int keywordi = querystring.indexOf("keyword:", 0);
if (keywordi >= 0) {
// TODO: should we handle quoted keywords (to allow space) and comma separated list ?
int ftb = querystring.indexOf(' ', keywordi);
this.keyword = querystring.substring(keywordi + 8, ftb == -1 ? querystring.length() : ftb);
querystring = querystring.replace("keyword:" + this.keyword, "").replace(" ", " ").trim();
add("keyword:" + this.keyword);
}
// parse collection // parse collection
int collectioni = querystring.indexOf("collection:", 0); int collectioni = querystring.indexOf("collection:", 0);
while (collectioni >= 0) { // due to possible collision with "on:" modifier make sure no "collection:" remains while (collectioni >= 0) { // due to possible collision with "on:" modifier make sure no "collection:" remains
@ -281,7 +292,11 @@ public class QueryModifier {
if (this.author != null && this.author.length() > 0 && fq.indexOf(CollectionSchema.author_sxt.getSolrFieldName()) < 0) { if (this.author != null && this.author.length() > 0 && fq.indexOf(CollectionSchema.author_sxt.getSolrFieldName()) < 0) {
fq.append(" AND ").append(CollectionSchema.author_sxt.getSolrFieldName()).append(":\"").append(this.author).append('\"'); fq.append(" AND ").append(CollectionSchema.author_sxt.getSolrFieldName()).append(":\"").append(this.author).append('\"');
} }
if (this.keyword != null && this.keyword.length() > 0 && fq.indexOf(CollectionSchema.keywords.getSolrFieldName()) < 0) {
fq.append(" AND ").append(CollectionSchema.keywords.getSolrFieldName()).append(":\"").append(this.keyword).append('\"');
}
if (this.collection != null && this.collection.length() > 0 && fq.indexOf(CollectionSchema.collection_sxt.getSolrFieldName()) < 0) { if (this.collection != null && this.collection.length() > 0 && fq.indexOf(CollectionSchema.collection_sxt.getSolrFieldName()) < 0) {
fq.append(" AND ").append(QueryModifier.parseCollectionExpression(this.collection)); fq.append(" AND ").append(QueryModifier.parseCollectionExpression(this.collection));
} }

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

@ -527,6 +527,11 @@ public final class QueryParams {
fqs.add(CollectionSchema.author_sxt.getSolrFieldName() + ":\"" + this.modifier.author + '\"'); fqs.add(CollectionSchema.author_sxt.getSolrFieldName() + ":\"" + this.modifier.author + '\"');
} }
// add keyword filter
if (this.modifier.keyword != null && this.modifier.keyword.length() > 0 && this.solrSchema.contains(CollectionSchema.keywords)) {
fqs.add(CollectionSchema.keywords.getSolrFieldName() + ":\"" + this.modifier.keyword + '\"');
}
// add collection facets // add collection facets
if (this.modifier.collection != null && this.modifier.collection.length() > 0 && this.solrSchema.contains(CollectionSchema.collection_sxt)) { if (this.modifier.collection != null && this.modifier.collection.length() > 0 && this.solrSchema.contains(CollectionSchema.collection_sxt)) {
fqs.add(QueryModifier.parseCollectionExpression(this.modifier.collection)); fqs.add(QueryModifier.parseCollectionExpression(this.modifier.collection));

8
source/net/yacy/search/query/SearchEvent.java
Unescape View File

@ -964,6 +964,14 @@ public final class SearchEvent {
continue pollloop; continue pollloop;
} }
} }
if (this.query.modifier.keyword != null) {
if (iEntry.dc_subject().indexOf(this.query.modifier.keyword) < 0) {
if (log.isFine()) log.fine ("dropped Node: keyword");
continue pollloop;
}
}
// finally extend the double-check and insert result to stack // finally extend the double-check and insert result to stack
this.urlhashes.putUnique(iEntry.hash()); this.urlhashes.putUnique(iEntry.hash());
rankingtryloop: while (true) { rankingtryloop: while (true) {

Write Preview
Loading…
Cancel
Save