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

@@ -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);

htroot/yacysearch.html

@@ -106,7 +106,6 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
     <input type="hidden" name="nav" value="#[search.navigation]#" />
     <input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
     <input type="hidden" name="depth" value="#[depth]#" />
-    <input type="hidden" name="cat" value="#[cat]#" />
     <input type="hidden" name="constraint" value="#[constraint]#" />
     <input type="hidden" name="meanCount" value="#[meanCount]#" />
 </form>

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");
 
         }

htroot/yacysearchitem.html

@@ -29,7 +29,7 @@
   #(showMetadata)#::&nbsp;|&nbsp;<a href="solr/select?q=id:%22#[urlhash]#%22&defType=edismax&start=0&rows=1&core=collection1&wt=html" target="_blank" onclick="return hs.htmlExpand(this, { objectType: 'ajax'} )">Metadata</a>#(/showMetadata)#
   #(showParser)#::&nbsp;|&nbsp;<a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#" target="_blank">Parser</a>#(/showParser)#
   #(showCitation)#::&nbsp;|&nbsp;<a href="api/citation.html?hash=#[urlhash]#" target="_blank">Citations</a>#(/showCitation)#
-  #(showPictures)#::&nbsp;|&nbsp;<a href="yacysearch.html?cat=image&amp;url=#[link]#&amp;query=#[former]#">Pictures</a>#(/showPictures)#
+  #(showPictures)#::&nbsp;|&nbsp;<a href="yacysearch.html?contentdom=image&amp;url=#[link]#&amp;query=#[former]# inurl:#[link]#" target="_blank">Pictures</a>#(/showPictures)#
   #(showCache)#::&nbsp;|&nbsp;<a href="CacheResource_p.html?url=#[link]#" target="_blank">Cache</a>#(/showCache)#
   #(showProxy)#::&nbsp;|&nbsp;<a href="proxy.html?url=#[link]#" target="_blank">Augmented Browsing</a>#(/showProxy)#
   #(showHostBrowser)#::&nbsp;|&nbsp;<a href="HostBrowser.html?path=#[link]#"><img src="env/grafics/minitree.png" width="15" height="8"/></a>#(/showHostBrowser)#

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