Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

include navigator-plugin output data in json and rss/xml output

Browse Source 
fix encoding of url for rss
fix unresolved-pattern of url in json & xml for domain navigator
This commit is contained in:
reger 2016-11-01 22:33:20 +01:00
parent 3d1d297308
commit da0f4ee599
3 changed files with 15 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htroot/yacysearchtrailer.java
View File

@ -131,8 +131,7 @@ public class yacysearchtrailer {
rawNav = ""; rawNav = "";
} }
prop.put(fileType, "nav-domains_element_" + i + "_name", name); prop.put(fileType, "nav-domains_element_" + i + "_name", name);
/* URL is already percent encoded : no need to re-encode specifically for the file type */ prop.put(fileType, "nav-domains_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put("nav-domains_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put(fileType, "nav-domains_element_" + i + "_id", "domains_" + i); prop.put(fileType, "nav-domains_element_" + i + "_id", "domains_" + i);
prop.put("nav-domains_element_" + i + "_count", count); prop.put("nav-domains_element_" + i + "_count", count);
prop.put("nav-domains_element_" + i + "_nl", 1); prop.put("nav-domains_element_" + i + "_nl", 1);
@ -174,8 +173,7 @@ public class yacysearchtrailer {
} }
String longname = ISO639.country(name); String longname = ISO639.country(name);
prop.put(fileType, "nav-languages_element_" + i + "_name", longname == null ? name : longname); prop.put(fileType, "nav-languages_element_" + i + "_name", longname == null ? name : longname);
/* URL is already percent encoded : no need to re-encode specifically for the file type */ prop.put(fileType, "nav-languages_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put("nav-languages_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put(fileType, "nav-languages_element_" + i + "_id", "languages_" + i); prop.put(fileType, "nav-languages_element_" + i + "_id", "languages_" + i);
prop.put("nav-languages_element_" + i + "_count", count); prop.put("nav-languages_element_" + i + "_count", count);
prop.put("nav-languages_element_" + i + "_nl", 1); prop.put("nav-languages_element_" + i + "_nl", 1);
@ -218,7 +216,7 @@ public class yacysearchtrailer {
prop.put("nav-topics_element_" + i + "_on", 1); prop.put("nav-topics_element_" + i + "_on", 1);
prop.put(fileType, "nav-topics_element_" + i + "_modifier", name); prop.put(fileType, "nav-topics_element_" + i + "_modifier", name);
prop.put(fileType, "nav-topics_element_" + i + "_name", name); prop.put(fileType, "nav-topics_element_" + i + "_name", name);
prop.put("nav-topics_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, name, false).toString()); prop.put(fileType, "nav-topics_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, name, false).toString());
prop.put("nav-topics_element_" + i + "_count", count); prop.put("nav-topics_element_" + i + "_count", count);
int fontsize = TOPWORDS_MINSIZE + (TOPWORDS_MAXSIZE - TOPWORDS_MINSIZE) * (count - mincount) / (1 + maxcount - mincount); int fontsize = TOPWORDS_MINSIZE + (TOPWORDS_MAXSIZE - TOPWORDS_MINSIZE) * (count - mincount) / (1 + maxcount - mincount);
fontsize = Math.max(TOPWORDS_MINSIZE, fontsize - (name.length() - 5)); fontsize = Math.max(TOPWORDS_MINSIZE, fontsize - (name.length() - 5));
@ -267,9 +265,9 @@ public class yacysearchtrailer {
rawNav = ""; rawNav = "";
} }
prop.put(fileType, "nav-protocols_element_" + i + "_name", name); prop.put(fileType, "nav-protocols_element_" + i + "_name", name);
/* URL is already percent encoded : no need to re-encode specifically for the file type */
String url = QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString(); String url = QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString();
prop.put("nav-protocols_element_" + i + "_on_url", url); prop.put("nav-protocols_element_" + i + "_on_url", url);
prop.put(fileType, "nav-protocols_element_" + i + "_url", url);
prop.put("nav-protocols_element_" + i + "_count", count); prop.put("nav-protocols_element_" + i + "_count", count);
prop.put("nav-protocols_element_" + i + "_nl", 1); prop.put("nav-protocols_element_" + i + "_nl", 1);
i++; i++;
@ -364,8 +362,7 @@ public class yacysearchtrailer {
rawNav = ""; rawNav = "";
} }
prop.put(fileType, "nav-filetypes_element_" + i + "_name", name); prop.put(fileType, "nav-filetypes_element_" + i + "_name", name);
/* URL is already percent encoded : no need to re-encode specifically for the file type */ prop.put(fileType, "nav-filetypes_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put("nav-filetypes_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put(fileType, "nav-filetypes_element_" + i + "_id", "filetypes_" + i); prop.put(fileType, "nav-filetypes_element_" + i + "_id", "filetypes_" + i);
prop.put("nav-filetypes_element_" + i + "_count", count); prop.put("nav-filetypes_element_" + i + "_count", count);
prop.put("nav-filetypes_element_" + i + "_nl", 1); prop.put("nav-filetypes_element_" + i + "_nl", 1);
@ -408,8 +405,7 @@ public class yacysearchtrailer {
rawNav = ""; rawNav = "";
} }
prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_name", name); prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_name", name);
/* URL is already percent encoded : no need to re-encode specifically for the file type */ prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_id", "vocabulary_" + navname + "_" + i); prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_id", "vocabulary_" + navname + "_" + i);
prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_count", count); prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_count", count);
prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_nl", 1); prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_nl", 1);
@ -469,8 +465,7 @@ public class yacysearchtrailer {
rawNav = ""; rawNav = "";
} }
prop.put(fileType, "navs_" + ni + "_element_" + i + "_name", navi.getElementDisplayName(name)); prop.put(fileType, "navs_" + ni + "_element_" + i + "_name", navi.getElementDisplayName(name));
// URL is already percent encoded : no need to re-encode specifically for the file type prop.put(fileType, "navs_" + ni + "_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put("navs_" + ni + "_element_" + i + "_url", QueryParams.navurl(fileType, 0, theSearch.query, rawNav, false).toString());
prop.put(fileType, "navs_" + ni + "_element_" + i + "_id", naviname + "_" + i); prop.put(fileType, "navs_" + ni + "_element_" + i + "_id", naviname + "_" + i);
prop.put("navs_" + ni + "_element_" + i + "_count", count); prop.put("navs_" + ni + "_element_" + i + "_count", count);
prop.put("navs_" + ni + "_element_" + i + "_nl", 1); prop.put("navs_" + ni + "_element_" + i + "_nl", 1);

32
htroot/yacysearchtrailer.json
View File

@ -46,9 +46,9 @@
{"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)# {"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)#
#{/element}# #{/element}#
] ]
},#(/nav-domains)##(nav-namespace)#::{ },#(/nav-domains)##{navs}#{
"facetname": "namespace", "facetname": "#[name]#",
"displayname": "Name Space", "displayname": "#[displayname]#",
"type": "String", "type": "String",
"min": "0", "min": "0",
"max": "0", "max": "0",
@ -58,31 +58,7 @@
{"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)# {"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)#
#{/element}# #{/element}#
] ]
},#(/nav-namespace)##(nav-authors)#::{ },#{/navs}##{nav-vocabulary}#{
"facetname": "authors",
"displayname": "Authors",
"type": "String",
"min": "0",
"max": "0",
"mean": "0",
"elements": [
#{element}#
{"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)#
#{/element}#
]
},#(/nav-authors)##(nav-collections)#::{
"facetname": "collections",
"displayname": "Collections",
"type": "String",
"min": "0",
"max": "0",
"mean": "0",
"elements": [
#{element}#
{"name": "#[name]#", "count": "#[count]#", "modifier": "#[modifier]#", "url": "#[url]#"}#(nl)#::,#(/nl)#
#{/element}#
]
},#(/nav-collections)##{nav-vocabulary}#{
"facetname": "#[navname]#", "facetname": "#[navname]#",
"displayname": "#[navname]#", "displayname": "#[navname]#",
"type": "String", "type": "String",

22
htroot/yacysearchtrailer.xml
View File

@ -6,27 +6,13 @@
#{/element}# #{/element}#
</yacy:facet> </yacy:facet>
#(/nav-domains)# #(/nav-domains)#
#(nav-namespace)#:: #{navs}#
<yacy:facet name="namespace" displayname="Namespace" type="String" min="0" max="0" mean="0"> <yacy:facet name="#[name]#" displayname="#[displayname]#" type="String" min="0" max="0" mean="0">
#{element}# #{element}#
<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" url="#[url]#"/> <yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" url="#[url]#"/>
#{/element}# #{/element}#
</yacy:facet> </yacy:facet>
#(/nav-namespace)# #{/navs}#
#(nav-authors)#::
<yacy:facet name="authors" displayname="Authors" type="String" min="0" max="0" mean="0">
#{element}#
<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" url="#[url]#"/>
#{/element}#
</yacy:facet>
#(/nav-authors)#
#(nav-collections)#::
<yacy:facet name="collections" displayname="Collections" type="String" min="0" max="0" mean="0">
#{element}#
<yacy:element name="#[name]#" count="#[count]#" modifier="#[modifier]#" url="#[url]#"/>
#{/element}#
</yacy:facet>
#(/nav-collections)#
#(nav-filetypes)#:: #(nav-filetypes)#::
<yacy:facet name="filetypes" displayname="Filetypes" type="String" min="0" max="0" mean="0"> <yacy:facet name="filetypes" displayname="Filetypes" type="String" min="0" max="0" mean="0">
#{element}# #{element}#