diff --git a/defaults/yacy.init b/defaults/yacy.init index ffac6aebe..dc8f1fe41 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -955,7 +955,7 @@ routing.deleteOldSeeds.time = 30 # options to remember the default search engines when using the search compare features compare_yacy.left = YaCy -compare_yacy.right = google.com +compare_yacy.right = scroogle.org # minimum free disk space for crawling (MiB) disk.free = 3000 diff --git a/htroot/ConfigNetwork_p.html b/htroot/ConfigNetwork_p.html index 19127d103..08be1457b 100644 --- a/htroot/ConfigNetwork_p.html +++ b/htroot/ConfigNetwork_p.html @@ -138,8 +138,11 @@ #(indexReceiveBlockBlacklistChecked.off)#::checked="checked" #(/indexReceiveBlockBlacklistChecked.off)#/> . +
- This is a distributed web crawler and also a caching HTTP proxy. You are using the online-interface of the application. You can use this interface to configure your personal settings, proxy settings, access control and crawling properties. You can also use this interface to start crawls, send messages to other peers and monitor your index, cache status and crawling processes. Most important, you can use the search page to search either your own or the global index. -
-- For more detailed information, visit the YaCy homepage. -
-- The proxy provides a search interface that accesses your local index, created from web pages that passed the proxy. The search can also be applied globally, by searching other peers. You can use the following options to enhance your search results: -
- ++ You are using the administration interface of your own search engine. You can create your own search index with YaCy. + To learn how to do that, watch one of the demonstration videos below: +
-- You may want to use accesskeys to navigate through the YaCy webinterface: -
-YaCy uses Regular Expressions for some functions, for example in the blacklist.
-There are some standards for these regexps, YaCy uses the syntax used by Perl 5.
-Here ist a short overview about the functions, which should fir for most cases:
-- Regex follow a special priority (descending): concatenation, unary operators (*,+,^,{}), binary operators (|). This can be overridden with brackets. -
-Example:
-
- .*heise.de/.*/[0-9]+
-
- - This matches heise.de/ with a string in front of it, for example "http://www.", followed by any string, then a slash and a number. The dot in "heise.de" is not escaped with "\", because it represents any character, thus the "." itself, too. -
-- A possible URL which would match this regexp is: http://www.heise.de/newsticker/meldung/59421 -
-- An URL which would not match is: http://www.heise.de/tp/r4/artikel/20/20701/1.html -
-- There is ".html" at the end, which is not included with the Regular Expression. -
++twitter this video +Download from Vimeo: FSCONS 2010: YaCy Demo +
+ ++twitter this video +Download from Vimeo: 26. Oberhofer Kolloquium 2011: YaCy Demo +
+ +Please see the tutorials on http://yacy.net
+ #%env/templates/footer.template%# diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java index 60e9c617d..564a0d755 100755 --- a/htroot/compare_yacy.java +++ b/htroot/compare_yacy.java @@ -36,9 +36,9 @@ import de.anomic.server.servletProperties; public class compare_yacy { private static final String defaultsearchL = "YaCy"; - private static final String defaultsearchR = "google.com"; + private static final String defaultsearchR = "scroogle.org"; private static final String[] order = {defaultsearchL, "YaCy (local)", "bing.com", - "google.de", defaultsearchR, "scroogle.org", + /*"google.de",*/ defaultsearchR, "scroogle.org", "metager.de", "metager2.de (web)", "metager2.de (international)", "yahoo.com", "romso.de", "search.live.com", "Wikipedia English", "Wikipedia Deutsch", "Sciencenet", "dbpedia", "wolfram alpha", "OAIster@OCLC", "oai.yacy.net"}; @@ -47,8 +47,8 @@ public class compare_yacy { searchengines.put(defaultsearchL, "yacysearch.html?display=2&resource=global&query="); searchengines.put("YaCy (local)", "yacysearch.html?display=2&resource=local&query="); searchengines.put("bing.com", "http://www.bing.com/search?q="); - searchengines.put("google.de", "http://www.google.de/#fp=1&q="); - searchengines.put("google.com", "http://www.google.com/#fp=1&q="); + //searchengines.put("google.de", "http://www.google.de/#fp=1&q="); + //searchengines.put("google.com", "http://www.google.com/#fp=1&q="); searchengines.put("scroogle.org", "http://www.scroogle.org/cgi-bin/nbbw.cgi?Gw="); searchengines.put("metager.de", "http://www.metager.de/meta/cgi-bin/meta.ger1?eingabe="); searchengines.put("metager2.de (web)", "http://www.metager2.de/search.php?ses=web&q="); @@ -73,7 +73,9 @@ public class compare_yacy { prop.put("display", display); String default_left = sb.getConfig("compare_yacy.left", defaultsearchL); + if (!searchengines.containsKey(default_left)) default_left = defaultsearchL; String default_right = sb.getConfig("compare_yacy.right", defaultsearchR); + if (!searchengines.containsKey(default_right)) default_right = defaultsearchR; if (post != null) { if (searchengines.get(post.get("left", default_left)) != null) { diff --git a/htroot/env/grafics/flag_deutsch_28x17.gif b/htroot/env/grafics/flag_deutsch_28x17.gif new file mode 100644 index 000000000..3192113e7 Binary files /dev/null and b/htroot/env/grafics/flag_deutsch_28x17.gif differ diff --git a/htroot/env/grafics/flag_english_28x17.gif b/htroot/env/grafics/flag_english_28x17.gif new file mode 100644 index 000000000..dfdf071d7 Binary files /dev/null and b/htroot/env/grafics/flag_english_28x17.gif differ diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 3facdfe3c..dbe7cb820 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -12,7 +12,6 @@