From 7c1707872bd62ffa3becaa9d7112d288b48aa9c8 Mon Sep 17 00:00:00 2001 From: reger Date: Tue, 30 Sep 2014 22:22:13 +0200 Subject: [PATCH] search result showPicture update search parameter used parameter &cat=image is obsolete and returns no results - remove &cat=image and &cat=href references - remove &tenant= references (unused) Use contentdom=image and inurl: parameter to make showPicture link display something (open in new window because of used inurl modifier changes original query) --- htroot/index.java | 2 -- htroot/yacysearch.html | 1 - htroot/yacysearch.java | 5 +---- htroot/yacysearchitem.html | 2 +- htroot/yacysearchtrailer.java | 4 ++-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/htroot/index.java b/htroot/index.java index c35928d25..49bf3e8ce 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -79,7 +79,6 @@ public class index { final int maximumRecords = sb.getConfigInt(SwitchboardConstants.SEARCH_ITEMS, 10); final String prefermaskfilter = (post == null) ? "" : post.get("prefermaskfilter", ""); final String constraint = (post == null) ? "" : post.get("constraint", ""); - final String cat = (post == null) ? "href" : post.get("cat", "href"); final int type = (post == null) ? 0 : post.getInt("type", 0); //final boolean indexDistributeGranted = sb.getConfigBool(SwitchboardConstants.INDEX_DIST_ALLOW, true); @@ -118,7 +117,6 @@ public class index { prop.putHTML("searchoptions_prefermaskoptions_prefermaskfilter", prefermaskfilter); prop.put("searchoptions_indexofChecked", ""); prop.put("results", ""); - prop.putHTML("cat", cat); prop.put("type", type); prop.put("depth", "0"); prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0); diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 188ed91fa..4c78087a6 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -106,7 +106,6 @@ To see a list of all APIs, please visit the - diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 9a81fb857..5107927fd 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -168,10 +168,8 @@ public class yacysearch { prop.put("resource", "global"); prop.put("urlmaskfilter", (post == null) ? ".*" : post.get("urlmaskfilter", ".*")); prop.put("prefermaskfilter", (post == null) ? "" : post.get("prefermaskfilter", "")); - prop.put("tenant", (post == null) ? "" : post.get("tenant", "")); prop.put("indexof", "off"); prop.put("constraint", ""); - prop.put("cat", "href"); prop.put("depth", "0"); prop.put( "search.verify", @@ -348,7 +346,7 @@ public class yacysearch { } } - if ( !block && (post == null || post.get("cat", "href").equals("href")) ) { + if ( !block ) { String urlmask = null; String tld = null; String inlink = null; @@ -858,7 +856,6 @@ public class yacysearch { prop.put("num-results", "3"); } - prop.put("cat", "href"); prop.put("depth", "0"); } diff --git a/htroot/yacysearchitem.html b/htroot/yacysearchitem.html index 2f1a2b430..a8e452804 100644 --- a/htroot/yacysearchitem.html +++ b/htroot/yacysearchitem.html @@ -29,7 +29,7 @@ #(showMetadata)#:: | Metadata#(/showMetadata)# #(showParser)#:: | Parser#(/showParser)# #(showCitation)#:: | Citations#(/showCitation)# - #(showPictures)#:: | Pictures#(/showPictures)# + #(showPictures)#:: | Pictures#(/showPictures)# #(showCache)#:: | Cache#(/showCache)# #(showProxy)#:: | Augmented Browsing#(/showProxy)# #(showHostBrowser)#:: | #(/showHostBrowser)# diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index 6dd8cabe6..8e1558a5f 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -525,5 +525,5 @@ public class yacysearchtrailer { } } -//http://localhost:8090/yacysearch.html?query=java+&maximumRecords=10&resource=local&verify=cacheonly&nav=hosts,authors,namespace,topics,filetype,protocol&urlmaskfilter=ftp://.*&prefermaskfilter=&cat=href&constraint=&contentdom=text&former=java+%2Fftp&startRecord=0 -//http://localhost:8090/yacysearch.html?query=java+&maximumRecords=10&resource=local&verify=cacheonly&nav=hosts,authors,namespace,topics,filetype,protocol&urlmaskfilter=.*&prefermaskfilter=&cat=href&constraint=&contentdom=text&former=java+%2Fvocabulary%2FGewerke%2FTore&startRecord=0 +//http://localhost:8090/yacysearch.html?query=java+&maximumRecords=10&resource=local&verify=cacheonly&nav=hosts,authors,namespace,topics,filetype,protocol&urlmaskfilter=ftp://.*&prefermaskfilter=&constraint=&contentdom=text&former=java+%2Fftp&startRecord=0 +//http://localhost:8090/yacysearch.html?query=java+&maximumRecords=10&resource=local&verify=cacheonly&nav=hosts,authors,namespace,topics,filetype,protocol&urlmaskfilter=.*&prefermaskfilter=&constraint=&contentdom=text&former=java+%2Fvocabulary%2FGewerke%2FTore&startRecord=0