remove blekko from opensearch config (not available)

see https://blekko.com/ http://searchengineland.com/goodbye-blekko-search-engine-joins-ibms-watson-team-217633
yacy · Jan 4, 2016 · e8256bb · e8256bb
1 parent 1af0e9e
commit e8256bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/defaults/heuristicopensearch.conf b/defaults/heuristicopensearch.conf
@@ -12,7 +12,6 @@
 ## - all lines beginning with '#' and where the second character is not '#' are commented-out keyword lines
 ##
 
-#Blekko = http://blekko.com/ws/{searchTerms} /rss  # get 20 results from blekko
 #Faroo-News = http://www.faroo.com/api?q={searchTerms}&start={startIndex}&length=20&l=en&src=news&f=rss  # get results from Faroo news-search
 #WordPress.com = http://en.search.wordpress.com/?q={searchTerms}&f=feed&page={startPage?}  #Search WordPress.com Blogs
 #Sueddeutsche.de = http://suche.sueddeutsche.de/query/{searchTerms}?output=rss # Sueddeutsche Zeitung Artikel Archiv

diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
@@ -476,8 +476,8 @@ public static serverObjects respond(
                 }
             }
 
-            final int heuristicBlekko = querystring.indexOf("/heuristic", 0);
-            if ( heuristicBlekko >= 0 ) {
+            final int heuristicOS = querystring.indexOf("/heuristic", 0);
+            if ( heuristicOS >= 0 ) {
                 querystring = querystring.replace("/heuristic", "");
                 modifier.add("/heuristic");
             }
@@ -721,14 +721,11 @@ public static serverObjects respond(
                         SwitchboardConstants.REMOTESEARCH_MAXTIME_USER,
                         sb.getConfigLong(SwitchboardConstants.REMOTESEARCH_MAXTIME_DEFAULT, 3000)));
 
-            if ( startRecord == 0 ) {
-                if ( modifier.sitehost != null && sb.getConfigBool(SwitchboardConstants.HEURISTIC_SITE, false) && authenticated && !stealthmode) {
+            if ( startRecord == 0 && authenticated && !stealthmode ) {
+                if ( modifier.sitehost != null && sb.getConfigBool(SwitchboardConstants.HEURISTIC_SITE, false) ) {
                     sb.heuristicSite(theSearch, modifier.sitehost);
                 }
-                if ( heuristicBlekko >= 0  && authenticated && !stealthmode ) {
-                    FederateSearchManager.getManager().search(theSearch);
-                }
-                if (sb.getConfigBool(SwitchboardConstants.HEURISTIC_OPENSEARCH, false) && authenticated && !stealthmode) {
+                if ( heuristicOS >= 0 || sb.getConfigBool(SwitchboardConstants.HEURISTIC_OPENSEARCH, false) ) {
                     FederateSearchManager.getManager().search(theSearch);
                 }
             }

diff --git a/locales/de.lng b/locales/de.lng
@@ -1603,7 +1603,7 @@ doublequotes==Anführungszeichen
 prefer given language==Angegebene Sprache bevorzugen
 an ISO639 2-letter code==2-Buchstaben-Ländercode nach ISO639
 heuristics==Heuristiken
-add search results from blekko==Benutze zusätzliche Ergebnisse von Blekko
+add search results from external opensearch systems==Benutze zusätzliche Ergebnisse von externen Opensearchsystemen
 Search Navigation==Such-Navigation
 keyboard shotcuts==Tastatur-Kürzel
 tab or page-up==Tab oder Bild hoch