added new navigation to search trailer json and xml files which causes that these navigation is also available in the search widget

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7796 6c8d7289-2bf4-0310-a012-ef5d649a1542

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", "<a href=\"" + QueryParams.navurl("html", 0, theQuery, theQuery.queryStringForUrl() + "+" + "site:" + name, theQuery.urlMask.toString(), theQuery.navigators).toString() + "\">" + name + " (" + count + ")</a>");
+                prop.put("nav-domains_element_" + i + "_url", "<a href=\"" + QueryParams.navurl("html", 0, theQuery, theQuery.queryStringForUrl() + "+" + dnav, theQuery.urlMask.toString(), theQuery.navigators).toString() + "\">" + name + " (" + count + ")</a>");
-                prop.putJSON("nav-domains_element_" + i + "_url-json", QueryParams.navurl("json", 0, theQuery, theQuery.queryStringForUrl() + "+" + "site:" + name, theQuery.urlMask.toString(), theQuery.navigators).toString());
+                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", "<a href=\"" + QueryParams.navurl("html", 0, theQuery, theQuery.queryStringForUrl() + "+" + anav, theQuery.urlMask.toString(), theQuery.navigators).toString() + "\">" + name + " (" + count + ")</a>");
                 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", "<a href=\"" + QueryParams.navurl("html", 0, theQuery, theQuery.queryStringForUrl() + "+" + pnav, theQuery.urlMask.toString(), theQuery.navigators).toString() + "\">" + name + " (" + count + ")</a>");
                 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", "<a href=\"" + QueryParams.navurl("html", 0, theQuery, theQuery.queryStringForUrl() + "+" + tnav, theQuery.urlMask.toString(), theQuery.navigators).toString() + "\">" + name + " (" + count + ")</a>");
                 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++;
             }

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",

htroot/yacysearchtrailer.xml

@@ -20,6 +20,20 @@
 #{/element}#
 </yacy:facet>
 #(/nav-authors)#
+#(nav-filetype)#::
+<yacy:facet name="domains" displayname="Filetypes" type="String" min="0" max="0" mean="0">
+#{element}#
+<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" />
+#{/element}#
+</yacy:facet>
+#(/nav-filetype)#
+#(nav-protocol)#::
+<yacy:facet name="domains" displayname="Protocols" type="String" min="0" max="0" mean="0">
+#{element}#
+<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" />
+#{/element}#
+</yacy:facet>
+#(/nav-protocol)#
 #(nav-topics)#::
 <yacy:facet name="topwords" displayname="Topics" type="String" min="0" max="0" mean="0">
 #{element}#