diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index 77ec1c2cc..28902ce54 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -92,14 +92,16 @@ public class yacysearchtrailer { prop.put("nav-domains", 1); navigatorIterator = hostNavigator.keys(false); int i = 0; + String dnav; while (i < 20 && navigatorIterator.hasNext()) { name = navigatorIterator.next(); count = hostNavigator.get(name); + dnav = "site:" + name; prop.putJSON("nav-domains_element_" + i + "_name", name); - prop.put("nav-domains_element_" + i + "_url", "" + name + " (" + count + ")"); - prop.putJSON("nav-domains_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + "site:" + name, theQuery.urlMask.toString(), theQuery.navigators).toString()); + prop.put("nav-domains_element_" + i + "_url", "" + name + " (" + count + ")"); + prop.putJSON("nav-domains_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + dnav, theQuery.urlMask.toString(), theQuery.navigators).toString()); prop.put("nav-domains_element_" + i + "_count", count); - prop.put("nav-domains_element_" + i + "_modifier", "site:" + name); + prop.put("nav-domains_element_" + i + "_modifier", dnav); prop.put("nav-domains_element_" + i + "_nl", 1); i++; } @@ -125,7 +127,7 @@ public class yacysearchtrailer { prop.put("nav-authors_element_" + i + "_url", "" + name + " (" + count + ")"); prop.putJSON("nav-authors_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + anav, theQuery.urlMask.toString(), theQuery.navigators).toString()); prop.put("nav-authors_element_" + i + "_count", count); - prop.put("nav-authors_element_" + i + "_modifier", "author:'" + name + "'"); + prop.put("nav-authors_element_" + i + "_modifier", anav); prop.put("nav-authors_element_" + i + "_nl", 1); i++; } @@ -180,7 +182,7 @@ public class yacysearchtrailer { prop.put("nav-protocols_element_" + i + "_url", "" + name + " (" + count + ")"); prop.putJSON("nav-protocols_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + pnav, theQuery.urlMask.toString(), theQuery.navigators).toString()); prop.put("nav-protocols_element_" + i + "_count", count); - prop.put("nav-protocols_element_" + i + "_modifier", "protocol:'" + name + "'"); + prop.put("nav-protocols_element_" + i + "_modifier", pnav); prop.put("nav-protocols_element_" + i + "_nl", 1); i++; } @@ -206,7 +208,7 @@ public class yacysearchtrailer { prop.put("nav-filetypes_element_" + i + "_url", "" + name + " (" + count + ")"); prop.putJSON("nav-filetypes_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + tnav, theQuery.urlMask.toString(), theQuery.navigators).toString()); prop.put("nav-filetypes_element_" + i + "_count", count); - prop.put("nav-filetypes_element_" + i + "_modifier", "filetype:'" + name + "'"); + prop.put("nav-filetypes_element_" + i + "_modifier", tnav); prop.put("nav-filetypes_element_" + i + "_nl", 1); i++; } diff --git a/htroot/yacysearchtrailer.json b/htroot/yacysearchtrailer.json index 21e155669..e14c5a800 100644 --- a/htroot/yacysearchtrailer.json +++ b/htroot/yacysearchtrailer.json @@ -1,4 +1,30 @@ - "navigation": [#(nav-domains)#:: + "navigation": [#(nav-filetypes)#:: + { + "facetname": "filetypes", + "displayname": "Filetype", + "type": "String", + "min": "0", + "max": "0", + "mean": "0", + "elements": [ +#{element}# + {"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url-json]#"}#(nl)#::,#(/nl)# +#{/element}# + ] + },#(/nav-filetypes)##(nav-protocols)#:: + { + "facetname": "protocols", + "displayname": "Protocol", + "type": "String", + "min": "0", + "max": "0", + "mean": "0", + "elements": [ +#{element}# + {"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url-json]#"}#(nl)#::,#(/nl)# +#{/element}# + ] + },#(/nav-protocols)##(nav-domains)#:: { "facetname": "domains", "displayname": "Domains", diff --git a/htroot/yacysearchtrailer.xml b/htroot/yacysearchtrailer.xml index dc2aca388..301411cfd 100644 --- a/htroot/yacysearchtrailer.xml +++ b/htroot/yacysearchtrailer.xml @@ -20,6 +20,20 @@ #{/element}# #(/nav-authors)# +#(nav-filetype)#:: + +#{element}# + +#{/element}# + +#(/nav-filetype)# +#(nav-protocol)#:: + +#{element}# + +#{/element}# + +#(/nav-protocol)# #(nav-topics)#:: #{element}#