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

fix search navigator not showing activated nav

Browse Source 
introduced with 97e84439fb
pull/1/head
reger 11 years ago
parent 771d8261c1
commit f47067b0ce
2 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
htroot/yacysearchtrailer.html
Unescape View File

@ -3,7 +3,7 @@
#(cat-location)#:: #(cat-location)#::
<div style="float:right; margin-top:5px; width:230px;"> <div style="float:right; margin-top:5px; width:230px;">
<a href="yacysearch_location.html?query=#[queryenc]#"> <a href="yacysearch_location.html?query=#[queryenc]#">
<img src="/env/grafics/earthsearch.png" width="215" height="159" alt="earthsearchlogo" /></a> <img src="env/grafics/earthsearch.png" width="215" height="159" alt="earthsearchlogo" /></a>
<a href="yacysearch_location.html?query=#[queryenc]#">Show search results for "#[query]#" on map</a> <a href="yacysearch_location.html?query=#[queryenc]#">Show search results for "#[query]#" on map</a>
</div> </div>
#(/cat-location)# #(/cat-location)#

64
htroot/yacysearchtrailer.java
Unescape View File

@ -76,8 +76,8 @@ public class yacysearchtrailer {
} else { } else {
prop.put("nav-namespace", 1); prop.put("nav-namespace", 1);
navigatorIterator = theSearch.namespaceNavigator.keys(false); navigatorIterator = theSearch.namespaceNavigator.keys(false);
int i = 0, p, pos = 0, neg = 0; int i = 0, pos = 0, neg = 0;
String nav, queryStringForUrl; String nav;
while (i < 10 && navigatorIterator.hasNext()) { while (i < 10 && navigatorIterator.hasNext()) {
name = navigatorIterator.next(); name = navigatorIterator.next();
count = theSearch.namespaceNavigator.get(name); count = theSearch.namespaceNavigator.get(name);
@ -85,9 +85,8 @@ public class yacysearchtrailer {
break; break;
} }
nav = "inurl%3A" + name; nav = "inurl%3A" + name;
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (!theSearch.query.modifier.toString().contains(nav)) {
if (p < 0) {
pos++; pos++;
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-namespace_element_" + i + "_on", 1); prop.put("nav-namespace_element_" + i + "_on", 1);
@ -96,7 +95,6 @@ public class yacysearchtrailer {
neg++; neg++;
prop.put("nav-namespace_element_" + i + "_on", 0); prop.put("nav-namespace_element_" + i + "_on", 0);
prop.put(fileType, "nav-namespace_element_" + i + "_modifier", "-" + nav); prop.put(fileType, "nav-namespace_element_" + i + "_modifier", "-" + nav);
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim();
} }
prop.put(fileType, "nav-namespace_element_" + i + "_name", name); prop.put(fileType, "nav-namespace_element_" + i + "_name", name);
prop.put(fileType, "nav-namespace_element_" + i + "_url", QueryParams.navurl(fileType.name().toLowerCase(), 0, theSearch.query, queryStringForUrl).toString()); prop.put(fileType, "nav-namespace_element_" + i + "_url", QueryParams.navurl(fileType.name().toLowerCase(), 0, theSearch.query, queryStringForUrl).toString());
@ -121,8 +119,8 @@ public class yacysearchtrailer {
} else { } else {
prop.put("nav-domains", 1); prop.put("nav-domains", 1);
navigatorIterator = hostNavigator.keys(false); navigatorIterator = hostNavigator.keys(false);
int i = 0, p, pos = 0, neg = 0; int i = 0, pos = 0, neg = 0;
String nav, queryStringForUrl; String nav;
while (i < 20 && navigatorIterator.hasNext()) { while (i < 20 && navigatorIterator.hasNext()) {
name = navigatorIterator.next(); name = navigatorIterator.next();
count = hostNavigator.get(name); count = hostNavigator.get(name);
@ -130,18 +128,16 @@ public class yacysearchtrailer {
break; break;
} }
nav = "site%3A" + name; nav = "site%3A" + name;
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (theSearch.query.modifier.sitehost == null || !theSearch.query.modifier.sitehost.contains(name)) {
if (p < 0) {
pos++; pos++;
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-domains_element_" + i + "_on", 1); prop.put("nav-domains_element_" + i + "_on", 1);
prop.put(fileType, "nav-domains_element_" + i + "_modifier", nav); prop.put(fileType, "nav-domains_element_" + i + "_modifier", nav);
} else { } else {
neg++; neg++;
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim(); prop.put("nav-domains_element_" + i + "_on", 0);
prop.put("nav-authors_element_" + i + "_on", 0); prop.put(fileType, "nav-domains_element_" + i + "_modifier", "-" + nav);
prop.put(fileType, "nav-authors_element_" + i + "_modifier", "-" + nav);
} }
prop.put(fileType, "nav-domains_element_" + i + "_name", name); prop.put(fileType, "nav-domains_element_" + i + "_name", name);
prop.put(fileType, "nav-domains_element_" + i + "_url", QueryParams.navurl(fileType.name().toLowerCase(), 0, theSearch.query, queryStringForUrl).toString()); prop.put(fileType, "nav-domains_element_" + i + "_url", QueryParams.navurl(fileType.name().toLowerCase(), 0, theSearch.query, queryStringForUrl).toString());
@ -165,8 +161,8 @@ public class yacysearchtrailer {
} else { } else {
prop.put("nav-authors", 1); prop.put("nav-authors", 1);
navigatorIterator = theSearch.authorNavigator.keys(false); navigatorIterator = theSearch.authorNavigator.keys(false);
int i = 0, p, pos = 0, neg = 0; int i = 0, pos = 0, neg = 0;
String nav, queryStringForUrl; String nav;
while (i < 20 && navigatorIterator.hasNext()) { while (i < 20 && navigatorIterator.hasNext()) {
name = navigatorIterator.next().trim(); name = navigatorIterator.next().trim();
count = theSearch.authorNavigator.get(name); count = theSearch.authorNavigator.get(name);
@ -174,16 +170,14 @@ public class yacysearchtrailer {
break; break;
} }
nav = (name.indexOf(' ', 0) < 0) ? "author%3A" + name : "author%3A%28" + name.replace(" ", "+") + "%29"; nav = (name.indexOf(' ', 0) < 0) ? "author%3A" + name : "author%3A%28" + name.replace(" ", "+") + "%29";
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (theSearch.query.modifier.author == null || !theSearch.query.modifier.author.contains(name)) {
if (p < 0) {
pos++; pos++;
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-authors_element_" + i + "_on", 1); prop.put("nav-authors_element_" + i + "_on", 1);
prop.put(fileType, "nav-authors_element_" + i + "_modifier", nav); prop.put(fileType, "nav-authors_element_" + i + "_modifier", nav);
} else { } else {
neg++; neg++;
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim();
prop.put("nav-authors_element_" + i + "_on", 0); prop.put("nav-authors_element_" + i + "_on", 0);
prop.put(fileType, "nav-authors_element_" + i + "_modifier", "-" + nav); prop.put(fileType, "nav-authors_element_" + i + "_modifier", "-" + nav);
} }
@ -246,8 +240,8 @@ public class yacysearchtrailer {
} else { } else {
prop.put("nav-protocols", 1); prop.put("nav-protocols", 1);
navigatorIterator = theSearch.protocolNavigator.keys(false); navigatorIterator = theSearch.protocolNavigator.keys(false);
int i = 0, p, pos = 0, neg = 0; int i = 0, pos = 0, neg = 0;
String nav, queryStringForUrl; String nav;
boolean visible = false; boolean visible = false;
while (i < 20 && navigatorIterator.hasNext()) { while (i < 20 && navigatorIterator.hasNext()) {
name = navigatorIterator.next().trim(); name = navigatorIterator.next().trim();
@ -257,16 +251,14 @@ public class yacysearchtrailer {
} }
visible = visible || "ftp,smb".indexOf(name) >= 0; visible = visible || "ftp,smb".indexOf(name) >= 0;
nav = "%2F" + name; nav = "%2F" + name;
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (theSearch.query.modifier.protocol == null || !theSearch.query.modifier.protocol.contains(name)) {
if (p < 0) {
pos++; pos++;
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-protocols_element_" + i + "_on", 1); prop.put("nav-protocols_element_" + i + "_on", 1);
prop.put(fileType, "nav-protocols_element_" + i + "_modifier", nav); prop.put(fileType, "nav-protocols_element_" + i + "_modifier", nav);
} else { } else {
neg++; neg++;
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim();
prop.put("nav-protocols_element_" + i + "_on", 0); prop.put("nav-protocols_element_" + i + "_on", 0);
prop.put(fileType, "nav-protocols_element_" + i + "_modifier", "-" + nav); prop.put(fileType, "nav-protocols_element_" + i + "_modifier", "-" + nav);
} }
@ -292,8 +284,8 @@ public class yacysearchtrailer {
} else { } else {
prop.put("nav-filetypes", 1); prop.put("nav-filetypes", 1);
navigatorIterator = theSearch.filetypeNavigator.keys(false); navigatorIterator = theSearch.filetypeNavigator.keys(false);
int i = 0, p, pos = 0, neg = 0; int i = 0, pos = 0, neg = 0;
String nav, queryStringForUrl; String nav;
boolean visible = false; boolean visible = false;
while (i < 20 && navigatorIterator.hasNext()) { while (i < 20 && navigatorIterator.hasNext()) {
name = navigatorIterator.next().trim(); name = navigatorIterator.next().trim();
@ -303,16 +295,14 @@ public class yacysearchtrailer {
} }
visible = visible || Classification.isMediaExtension(name) || "pdf,doc,docx".indexOf(name) >= 0; visible = visible || Classification.isMediaExtension(name) || "pdf,doc,docx".indexOf(name) >= 0;
nav = "filetype%3A" + name; nav = "filetype%3A" + name;
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (theSearch.query.modifier.filetype == null || !theSearch.query.modifier.filetype.contains(name) ) {
if (p < 0) {
pos++; pos++;
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-filetypes_element_" + i + "_on", 1); prop.put("nav-filetypes_element_" + i + "_on", 1);
prop.put(fileType, "nav-filetypes_element_" + i + "_modifier", nav); prop.put(fileType, "nav-filetypes_element_" + i + "_modifier", nav);
} else { } else {
neg++; neg++;
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim();
prop.put("nav-filetypes_element_" + i + "_on", 0); prop.put("nav-filetypes_element_" + i + "_on", 0);
prop.put(fileType, "nav-filetypes_element_" + i + "_modifier", "-" + nav); prop.put(fileType, "nav-filetypes_element_" + i + "_modifier", "-" + nav);
} }
@ -343,8 +333,8 @@ public class yacysearchtrailer {
} }
prop.put(fileType, "nav-vocabulary_" + navvoccount + "_navname", navname); prop.put(fileType, "nav-vocabulary_" + navvoccount + "_navname", navname);
navigatorIterator = ve.getValue().keys(false); navigatorIterator = ve.getValue().keys(false);
int i = 0, p; int i = 0;
String nav, queryStringForUrl; String nav;
while (i < 20 && navigatorIterator.hasNext()) { while (i < 20 && navigatorIterator.hasNext()) {
name = navigatorIterator.next(); name = navigatorIterator.next();
count = ve.getValue().get(name); count = ve.getValue().get(name);
@ -352,14 +342,12 @@ public class yacysearchtrailer {
break; break;
} }
nav = "%2Fvocabulary%2F" + navname + "%2F" + MultiProtocolURL.escape(Tagging.encodePrintname(name)).toString(); nav = "%2Fvocabulary%2F" + navname + "%2F" + MultiProtocolURL.escape(Tagging.encodePrintname(name)).toString();
queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true); String queryStringForUrl = theSearch.query.getQueryGoal().getQueryString(true);
p = queryStringForUrl.indexOf(nav); if (!theSearch.query.modifier.toString().contains("/vocabulary/")) {
if (p < 0) {
queryStringForUrl += "+" + nav; queryStringForUrl += "+" + nav;
prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_on", 1); prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_on", 1);
prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_modifier", nav); prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_modifier", nav);
} else { } else {
queryStringForUrl = (queryStringForUrl.substring(0, p) + queryStringForUrl.substring(p + nav.length())).trim();
prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_on", 0); prop.put("nav-vocabulary_" + navvoccount + "_element_" + i + "_on", 0);
prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_modifier", "-" + nav); prop.put(fileType, "nav-vocabulary_" + navvoccount + "_element_" + i + "_modifier", "-" + nav);
} }

Write Preview
Loading…
Cancel
Save