From 693fa2a157b60c75d661157c25042d09039f7c94 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 15 Sep 2008 09:17:05 +0000 Subject: [PATCH] - renamed Comparison to compare_yacy - added more search engines - some refactoring and added a list that is used to present the search engine list in a specific order - added simpleheader and no-header options - added the compare search to the simple header - added default compare search page selection storage - after re-start you get the same default search engines as you selected before git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5157 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- build.properties | 2 +- defaults/yacy.init | 7 +- htroot/Comparison_p.java | 80 ------------- .../{Comparison_p.html => compare_yacy.html} | 106 +++++++++--------- htroot/compare_yacy.java | 98 ++++++++++++++++ htroot/env/templates/header.template | 2 +- htroot/env/templates/simpleheader.template | 15 +-- 7 files changed, 167 insertions(+), 143 deletions(-) delete mode 100644 htroot/Comparison_p.java rename htroot/{Comparison_p.html => compare_yacy.html} (93%) mode change 100644 => 100755 create mode 100755 htroot/compare_yacy.java diff --git a/build.properties b/build.properties index 1d8892dbd..384d4bc8d 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.5 javacTarget=1.5 # Release Configuration -releaseVersion=0.597 +releaseVersion=0.598 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz diff --git a/defaults/yacy.init b/defaults/yacy.init index 48c1b9b6f..10cef80b3 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -881,8 +881,7 @@ autoReCrawl_idlesleep = 3600000 autoReCrawl_busysleep = 3600000 autoReCrawl_memprereq = -1 - - - - +# options to remember the default search engines when using the search compare features +compare_yacy.left = YaCy +compare_yacy.right = YaCy diff --git a/htroot/Comparison_p.java b/htroot/Comparison_p.java deleted file mode 100644 index 764cbe09c..000000000 --- a/htroot/Comparison_p.java +++ /dev/null @@ -1,80 +0,0 @@ -//Comparison_p.java -//----------------------- -//part of the AnomicHTTPD caching proxy -//(C) by Michael Peter Christen; mc@yacy.net -//first published on http://www.anomic.de -//Frankfurt, Germany, 2004 -// -//This File is contributed by Marc Nause -//last major change: 13.09.2008 -// -//This program is free software; you can redistribute it and/or modify -//it under the terms of the GNU General Public License as published by -//the Free Software Foundation; either version 2 of the License, or -//(at your option) any later version. -// -//This program is distributed in the hope that it will be useful, -//but WITHOUT ANY WARRANTY; without even the implied warranty of -//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -//GNU General Public License for more details. -// -//You should have received a copy of the GNU General Public License -//along with this program; if not, write to the Free Software -//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -//You must compile this file with -//javac -classpath .:../Classes Message.java -//if the shell's current path is HTROOT - - -import de.anomic.http.httpRequestHeader; -import de.anomic.server.serverObjects; -import de.anomic.server.serverSwitch; -import de.anomic.server.servletProperties; -import java.util.Hashtable; -import java.util.Map; - -public class Comparison_p{ - - public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) { - final servletProperties prop = new servletProperties(); - - Map searchengines = new Hashtable(); - searchengines.put("YaCy", "yacysearch.html?display=2&query="); - searchengines.put("google.de", "http://www.google.de/search?q="); - searchengines.put("metager.de", "http://www.metager.de/meta/cgi-bin/meta.ger1?eingabe="); - - if (post != null) { - prop.put("search", 1); - prop.putHTML("search_query", post.get("query", "")); - prop.putHTML("search_left", searchengines.get(post.get("left", searchengines.get("YaCy")))); - prop.putHTML("search_right", searchengines.get(post.get("right", searchengines.get("YaCy")))); - } else { - - prop.put("search", 0); - prop.put("search_query", ""); - - } - - prop.put("searchengines", searchengines.size()); - int i = 0; - for(String name : searchengines.keySet()){ - prop.putHTML("searchengines_" + i + "_searchengine", name); - if(post != null && post.get("left").equals(name)) { - prop.put("searchengines_" + i + "_leftengine", 1); - } else { - prop.put("searchengines_" + i + "_leftengine", 0); - } - if(post != null && post.get("right").equals(name)) { - prop.put("searchengines_" + i + "_rightengine", 1); - } else { - prop.put("searchengines_" + i + "_rightengine", 0); - } - i++; - } - - // return rewrite properties - return prop; - } -} diff --git a/htroot/Comparison_p.html b/htroot/compare_yacy.html old mode 100644 new mode 100755 similarity index 93% rename from htroot/Comparison_p.html rename to htroot/compare_yacy.html index 54bb5b524..c4c992b0f --- a/htroot/Comparison_p.html +++ b/htroot/compare_yacy.html @@ -1,50 +1,56 @@ - - - - YaCy '#[clientname]#': Websearch Comparison - #%env/templates/metas.template%# - - - #%env/templates/header.template%# -

Websearch Comparison

-

This page lets you compare two search engines. Please select search engines - and enter your searchword(s) below.

-
- Parameters -
-
-
Left Search Engine
-
- -
-
Right Search Engine
-
- -
-
Query
-
- -
-
- -
-
- #(search)# - :: -
- Search Result - - -
- #(/search)# - #%env/templates/footer.template%# - - + + + + YaCy '#[clientname]#': Websearch Comparison + #%env/templates/metas.template%# + + +#(display)# + #%env/templates/simpleheader.template%# + :: + #%env/templates/header.template%# + :: + #%env/templates/embeddedheader.template%# +#(/display)# +

Websearch Comparison

+

This page lets you compare two search engines. Please select search engines + and enter your searchword(s) below.

+
+ Parameters +
+
+
Left Search Engine
+
+ +
+
Right Search Engine
+
+ +
+
Query
+
+ +
+
+ +
+
+ #(search)# + :: +
+ Search Result + + +
+ #(/search)# + #%env/templates/footer.template%# + + diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java new file mode 100755 index 000000000..f8178efef --- /dev/null +++ b/htroot/compare_yacy.java @@ -0,0 +1,98 @@ +// compare_yacy.java +// (C) 2008 by Marc Nause +// first published 13.09.2008 on http://yacy.net +// +// This is a part of YaCy, a peer-to-peer based web search engine +// +// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ +// $LastChangedRevision: 1986 $ +// $LastChangedBy: orbiter $ +// +// LICENSE +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import de.anomic.http.httpRequestHeader; +import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; +import de.anomic.server.servletProperties; + +import java.util.HashMap; +import java.util.Map; + +public class compare_yacy { + + private static final String defaultsearch = "YaCy"; + private static final String[] order = {defaultsearch, "YaCy (local)", "google.de", "google.com", "metager.de", "yahoo.com", "romso.de", "search.live.com", "Wikipedia English", "Wikipedia Deutsch"}; + private static final Map searchengines = new HashMap(); + static { + searchengines.put(defaultsearch, "yacysearch.html?display=2&verify=true&resource=global&query="); + searchengines.put("YaCy (local)", "yacysearch.html?display=2&verify=true&resource=local&query="); + searchengines.put("google.de", "http://www.google.de/search?q="); + searchengines.put("google.com", "http://www.google.com/search?q="); + searchengines.put("metager.de", "http://www.metager.de/meta/cgi-bin/meta.ger1?eingabe="); + searchengines.put("yahoo.com", "http://search.yahoo.com/search?p="); + searchengines.put("romso.de", "http://romso.de/?q="); + searchengines.put("search.live.com", "http://search.live.com/results.aspx?q="); + searchengines.put("Wikipedia English", "http://en.wikipedia.org/wiki/"); + searchengines.put("Wikipedia Deutsch", "http://de.wikipedia.org/wiki/"); + } + + public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) { + final plasmaSwitchboard sb = (plasmaSwitchboard) env; + final boolean authenticated = sb.adminAuthenticated(header) >= 2; + final int display = ((post == null) || (!authenticated)) ? 0 : post.getInt("display", 0); + final servletProperties prop = new servletProperties(); + + prop.put("display", display); + + String default_left = sb.getConfig("compare_yacy.left", defaultsearch); + String default_right = sb.getConfig("compare_yacy.right", defaultsearch); + + if (post != null) { + prop.put("search", 1); + prop.putHTML("search_query", post.get("query", "")); + prop.putHTML("search_left", searchengines.get(post.get("left", default_left))); + prop.putHTML("search_right", searchengines.get(post.get("right", default_right))); + } else { + prop.put("search", 0); + prop.put("search_query", ""); + } + + + prop.put("searchengines", order.length); + String name; + for (int i = 0; i < order.length; i++) { + name = order[i]; + prop.putHTML("searchengines_" + i + "_searchengine", name); + if (post != null && post.get("left", default_left).equals(name)) { + prop.put("searchengines_" + i + "_leftengine", 1); + sb.setConfig("compare_yacy.left", name); + } else { + prop.put("searchengines_" + i + "_leftengine", 0); + } + if (post != null && post.get("right", default_right).equals(name)) { + prop.put("searchengines_" + i + "_rightengine", 1); + sb.setConfig("compare_yacy.right", name); + } else { + prop.put("searchengines_" + i + "_rightengine", 0); + } + } + + // return rewrite properties + return prop; + } +} diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 238133c37..fe6d55024 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -8,7 +8,7 @@
  • Search Page (standard)
  • Search Page (alternative)
  • Search Page (Rich Client)
    • -
  • Compare Search
    • +
  • Compare Search
  • Ranking Config
  • Surftips
  • Publication
    • diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template index 1cc0490c0..d50a5fca7 100644 --- a/htroot/env/templates/simpleheader.template +++ b/htroot/env/templates/simpleheader.template @@ -1,12 +1,13 @@