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

re-designed response format for navigation:

Browse Source 
- changed json and rss response templates


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6019 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 16 years ago
parent 15fad767c0
commit 1c77db670f
7 changed files with 107 additions and 89 deletions
Show Stats Download Patch File Download Diff File

35
htroot/yacysearch.java
Unescape View File

@ -457,49 +457,32 @@ public class yacysearch {
final StringBuilder resnav = new StringBuilder(); final StringBuilder resnav = new StringBuilder();
final int thispage = offset / theQuery.displayResults(); final int thispage = offset / theQuery.displayResults();
if (thispage == 0) { if (thispage == 0) {
//resnav.append("< ");
resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\">&nbsp;"); resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\">&nbsp;");
} else { } else {
/* resnav.append("<a href=\"");
resnav.append(navurla(thispage - 1, display, theQuery, originalUrlMask)); resnav.append(plasmaSearchQuery.navurl("html", thispage - 1, display, theQuery, originalUrlMask, null));
resnav.append("<strong>&lt;</strong></a>&nbsp;"); resnav.append("\"><img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\"></a>&nbsp;");
*/
resnav.append(plasmaSearchQuery.navurla(thispage - 1, display, theQuery, originalUrlMask, null));
resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\"></a>&nbsp;");
} }
final int numberofpages = Math.min(10, Math.max(thispage + 2, totalcount / theQuery.displayResults())); final int numberofpages = Math.min(10, Math.max(thispage + 2, totalcount / theQuery.displayResults()));
for (int i = 0; i < numberofpages; i++) { for (int i = 0; i < numberofpages; i++) {
if (i == thispage) { if (i == thispage) {
/*
resnav.append("<strong>");
resnav.append(i + 1);
resnav.append("</strong>&nbsp;");
*/
resnav.append("<img src=\"env/grafics/navs"); resnav.append("<img src=\"env/grafics/navs");
resnav.append(i + 1); resnav.append(i + 1);
resnav.append(".gif\" width=\"16\" height=\"16\">&nbsp;"); resnav.append(".gif\" width=\"16\" height=\"16\">&nbsp;");
} else { } else {
/* resnav.append("<a href=\"");
resnav.append(navurla(i, display, theQuery, originalUrlMask)); resnav.append(plasmaSearchQuery.navurl("html", i, display, theQuery, originalUrlMask, null));
resnav.append(i + 1); resnav.append("\"><img src=\"env/grafics/navd");
resnav.append("</a>&nbsp;");
*/
resnav.append(plasmaSearchQuery.navurla(i, display, theQuery, originalUrlMask, null));
resnav.append("<img src=\"env/grafics/navd");
resnav.append(i + 1); resnav.append(i + 1);
resnav.append(".gif\" width=\"16\" height=\"16\"></a>&nbsp;"); resnav.append(".gif\" width=\"16\" height=\"16\"></a>&nbsp;");
} }
} }
if (thispage >= numberofpages) { if (thispage >= numberofpages) {
//resnav.append("&gt;");
resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\">"); resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\">");
} else { } else {
/* resnav.append("<a href=\"");
resnav.append(navurla(thispage + 1, display, theQuery, originalUrlMask)); resnav.append(plasmaSearchQuery.navurl("html", thispage + 1, display, theQuery, originalUrlMask, null));
resnav.append("<strong>&gt;</strong></a>"); resnav.append("\"><img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\"></a>");
*/
resnav.append(plasmaSearchQuery.navurla(thispage + 1, display, theQuery, originalUrlMask, null));
resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\"></a>");
} }
prop.put("num-results_resnav", resnav.toString()); prop.put("num-results_resnav", resnav.toString());

20
htroot/yacysearchtrailer.html
Unescape View File

@ -1,17 +1,19 @@
#(navigation)# #(nav-domains)#
:: ::
<h3 style="padding-left:25px;">Domains</h3> <h3 style="padding-left:25px;">Domains</h3>
<div> <div>
<ul style="padding-left: 0px;"> <ul style="padding-left: 0px;">#{element}#
#{domains}# <li>#[url]#</li>
<li>#[domain]#</li> #{/element}#
#{/domains}#
</ul></div> </ul></div>
#(/navigation)# #(/nav-domains)#
#(nav-topics)#::
<h3 style="padding-left:25px;">Topics</h3> <h3 style="padding-left:25px;">Topics</h3>
<div><ul style="padding-left: 0px;">#{words}# <div><ul style="padding-left: 0px;">#{element}#
<li><a href="yacysearch.html?search=#[newsearch]#&amp;Enter=Search&amp;count=#[count]#&amp;offset=#[offset]#&amp;resource=#[resource]#&amp;contentdom=#[contentdom]#&amp;display=#[display]#">#[word]#</a></li> <li>#[url]#</li>
#{/words}#</ul></div> #{/element}#</ul></div>
#(/nav-topics)#
<h3 style="padding-left:25px;">Timeline</h3> <h3 style="padding-left:25px;">Timeline</h3>
<div> <div>
<p> <p>

52
htroot/yacysearchtrailer.java
Unescape View File

@ -47,9 +47,6 @@ public class yacysearchtrailer {
final String eventID = post.get("eventID", ""); final String eventID = post.get("eventID", "");
final int display = post.getInt("display", 0); final int display = post.getInt("display", 0);
// default settings for blank item
prop.put("words", "0");
// find search event // find search event
final plasmaSearchEvent theSearch = plasmaSearchEvent.getEvent(eventID); final plasmaSearchEvent theSearch = plasmaSearchEvent.getEvent(eventID);
if (theSearch == null) { if (theSearch == null) {
@ -62,46 +59,55 @@ public class yacysearchtrailer {
// compose search navigation // compose search navigation
ArrayList<NavigatorEntry> hostNavigator = theSearch.getHostNavigator(10); ArrayList<NavigatorEntry> hostNavigator = theSearch.getHostNavigator(10);
if (hostNavigator == null) { if (hostNavigator == null) {
prop.put("navigation", 0); prop.put("nav-domains", 0);
} else { } else {
prop.put("navigation", 1); prop.put("nav-domains", 1);
NavigatorEntry entry; NavigatorEntry entry;
int i; int i;
for (i = 0; i < hostNavigator.size(); i++) { for (i = 0; i < hostNavigator.size(); i++) {
entry = hostNavigator.get(i); entry = hostNavigator.get(i);
prop.put("navigation_domains_" + i + "_domain", plasmaSearchQuery.navurla(0, display, theQuery, theQuery.urlMask, "site:" + entry.name) + entry.name + " (" + entry.count + ")</a>"); prop.put("nav-domains_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name) + "\">" + entry.name + " (" + entry.count + ")</a>");
prop.putJSON("navigation_domains_" + i + "_domain-json", plasmaSearchQuery.navurla(0, display, theQuery, theQuery.urlMask, "site:" + entry.name) + entry.name + " (" + entry.count + ")</a>"); prop.putJSON("nav_domains_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, "site:" + entry.name));
prop.put("navigation_domains_" + i + "_nl", 1); prop.put("nav-domains_element_" + i + "_name", entry.name);
prop.put("nav-domains_element_" + i + "_count", entry.count);
prop.put("nav-domains_element_" + i + "_modifier", "site:" + entry.name);
prop.put("nav-domains_element_" + i + "_nl", 1);
} }
i--; i--;
prop.put("navigation_domains_" + i + "_nl", 0); prop.put("nav_domains_element_" + i + "_nl", 0);
prop.put("navigation_domains", hostNavigator.size()); prop.put("nav_domains_element", hostNavigator.size());
} }
// attach the bottom line with search references (topwords) // attach the bottom line with search references (topwords)
final ArrayList<NavigatorEntry> references = theSearch.getTopicNavigator(10); final ArrayList<NavigatorEntry> references = theSearch.getTopicNavigator(10);
// default settings for no topics
prop.put("nav-topics", "0");
if (references.size() > 0) { if (references.size() > 0) {
int hintcount = 0; int i = 0;
NavigatorEntry e; NavigatorEntry e;
Iterator<NavigatorEntry> iter = references.iterator(); Iterator<NavigatorEntry> iter = references.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
e = iter.next(); e = iter.next();
if (/*(theQuery == null) ||*/ (theQuery.queryString == null)) break; if (/*(theQuery == null) ||*/ (theQuery.queryString == null)) break;
if (e.name != null) { if (e != null && e.name != null) {
prop.putHTML("words_" + hintcount + "_word", e.name); prop.putHTML("nav-topics_element_" + i + "_name", e.name);
prop.putHTML("words_" + hintcount + "_newsearch", theQuery.queryString.replace(' ', '+') + "+" + e.name); prop.put("nav-topics_element_" + i + "_url", "<a href=\"" + plasmaSearchQuery.navurl("html", 0, display, theQuery, theQuery.urlMask, e.name) + "\">" + e.name + " (" + e.count + ")</a>");
prop.put("words_" + hintcount + "_count", theQuery.displayResults()); prop.putJSON("nav-topics_element_" + i + "_url-json", plasmaSearchQuery.navurl("json", 0, display, theQuery, theQuery.urlMask, e.name));
prop.put("words_" + hintcount + "_offset", "0"); prop.put("nav-topics_element_" + i + "_count", e.count);
prop.put("words_" + hintcount + "_display", display); prop.put("nav-topics_element_" + i + "_offset", "0");
prop.put("words_" + hintcount + "_contentdom", theQuery.contentdom()); prop.put("nav-topics_element_" + i + "_display", display);
prop.put("words_" + hintcount + "_resource", ((theQuery.isLocal()) ? "local" : "global")); prop.put("nav-topics_element_" + i + "_modifier", e.name);
prop.put("words_" + hintcount + "_nl", (iter.hasNext() && hintcount < MAX_TOPWORDS) ? 1 : 0); prop.put("nav-topics_element_" + i + "_contentdom", theQuery.contentdom());
prop.put("nav-topics_element_" + i + "_resource", ((theQuery.isLocal()) ? "local" : "global"));
prop.put("nav-topics_element_" + i + "_nl", (iter.hasNext() && i < MAX_TOPWORDS) ? 1 : 0);
} }
if (hintcount++ > MAX_TOPWORDS) { if (i++ > MAX_TOPWORDS) {
break; break;
} }
} }
prop.put("words", hintcount); prop.put("nav-topics_element", i);
prop.put("nav-topics", "1");
} }
serverProfiling.update("SEARCH", new plasmaProfiling.searchEvent(theQuery.id(true), plasmaSearchEvent.FINALIZATION + "-" + "bottomline", 0, 0), false); serverProfiling.update("SEARCH", new plasmaProfiling.searchEvent(theQuery.id(true), plasmaSearchEvent.FINALIZATION + "-" + "bottomline", 0, 0), false);

41
htroot/yacysearchtrailer.json
Unescape View File

@ -1,13 +1,28 @@
"topwords": [ "navigation": [#(nav-domains)#::
#{words}# {
{ "word": "#[word]#" }#(nl)#::,#(/nl)# "facetname": "domains",
#{/words}# "displayname": "Domains",
], "type": "String",
#(navigation)# "min": "0",
:: "max": "0",
"domains": [ "mean": "0",
#{domains}# "elements": [
{ "domain": "#[domain-json]#" }#(nl)#::,#(/nl)# #{element}#
#{/domains}# {"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url-json]#"}#(nl)#::,#(/nl)#
] #{/element}#
#(/navigation)# ]
},#(/nav-domains)##(nav-topics)#::
{
"facetname": "topwords",
"displayname": "Topics",
"type": "String",
"min": "0",
"max": "0",
"mean": "0",
"elements": [
#{element}#
{"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url-json]#"}#(nl)#::,#(/nl)#
#{/element}#
]
}#(/nav-topics)#
]

22
htroot/yacysearchtrailer.xml
Unescape View File

@ -1,5 +1,17 @@
<yacy:topwords> <yacy:navigation>
#{words}# #(nav-domains)#::
<yacy:item>#[word]#</yacy:item> <yacy:facet name="domains" displayname="Domains" type="String" min="0" max="0" mean="0">
#{/words}# #{element}#
</yacy:topwords> <yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" />
#{/element}#
</yacy:facet>
#(/nav-domains)#
#(nav-topics)#::
<yacy:facet name="topwords" displayname="Topics" type="String" min="0" max="0" mean="0">
#{element}#
<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" />
#{/element}#
</yacy:facet>
#(/nav-topics)#
</yacy:navigation>

24
source/de/anomic/plasma/plasmaSearchQuery.java
Unescape View File

@ -339,18 +339,18 @@ public final class plasmaSearchQuery {
* @param addToQuery * @param addToQuery
* @return * @return
*/ */
public static String navurla(final int page, final int display, final plasmaSearchQuery theQuery, final String originalUrlMask, String addToQuery) { public static String navurl(String ext, final int page, final int display, final plasmaSearchQuery theQuery, final String originalUrlMask, String addToQuery) {
return return
"<a href=\"yacysearch.html?display=" + display + "/yacysearch." + ext + "?display=" + display +
"&amp;search=" + theQuery.queryString(true) + ((addToQuery == null) ? "" : "+" + addToQuery) + "&search=" + theQuery.queryString(true) + ((addToQuery == null) ? "" : "+" + addToQuery) +
"&amp;maximumRecords="+ theQuery.displayResults() + "&maximumRecords="+ theQuery.displayResults() +
"&amp;startRecord=" + (page * theQuery.displayResults()) + "&startRecord=" + (page * theQuery.displayResults()) +
"&amp;resource=" + ((theQuery.isLocal()) ? "local" : "global") + "&resource=" + ((theQuery.isLocal()) ? "local" : "global") +
"&amp;verify=" + ((theQuery.onlineSnippetFetch) ? "true" : "false") + "&verify=" + ((theQuery.onlineSnippetFetch) ? "true" : "false") +
"&amp;urlmaskfilter=" + originalUrlMask + "&urlmaskfilter=" + originalUrlMask +
"&amp;prefermaskfilter=" + theQuery.prefer + "&prefermaskfilter=" + theQuery.prefer +
"&amp;cat=href&amp;constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) + "&cat=href&amp;constraint=" + ((theQuery.constraint == null) ? "" : theQuery.constraint.exportB64()) +
"&amp;contentdom=" + theQuery.contentdom() + "&contentdom=" + theQuery.contentdom() +
"&amp;former=" + theQuery.queryString(true) + "\">"; "&former=" + theQuery.queryString(true);
} }
} }

2
source/de/anomic/server/serverObjects.java
Unescape View File

@ -153,7 +153,7 @@ public class serverObjects extends HashMap<String, String> implements Cloneable
* @return the modified String that was added to the map. * @return the modified String that was added to the map.
*/ */
public String putJSON(final String key, String value) { public String putJSON(final String key, String value) {
value = value.replaceAll("\"", ""); // temporary fix until right quotation is known value = value.replaceAll("\"", "\\\"");
value = value.replaceAll("/", "\\/"); value = value.replaceAll("/", "\\/");
// value = value.replaceAll("\\", "\\\\"); // value = value.replaceAll("\\", "\\\\");
value = value.replaceAll("\b", "\\b"); value = value.replaceAll("\b", "\\b");

Write Preview
Loading…
Cancel
Save