From b2b7edae18d09ee168464f7d4dfca5428f3309d9 Mon Sep 17 00:00:00 2001 From: orbiter Date: Tue, 6 Jan 2009 20:04:09 +0000 Subject: [PATCH] fixed interactive search - added dummy servlet class, because otherwise the template engine is not triggered. thats so because the yacy httpd works much faster as normal file server without a scan of the served pages. Therefore each page with templates must now have a class file associated to it. - fixed json output format of yacysearch git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5449 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/interactivesearch.html | 2 +- htroot/interactivesearch.java | 41 +++++++++++++++++++ htroot/yacysearch.java | 5 ++- .../de/anomic/plasma/plasmaSwitchboard.java | 2 +- 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 htroot/interactivesearch.java diff --git a/htroot/interactivesearch.html b/htroot/interactivesearch.html index 45b2e4fb3..7f4a02dac 100644 --- a/htroot/interactivesearch.html +++ b/htroot/interactivesearch.html @@ -37,7 +37,7 @@ function updatepage(str){ html += ""; html += ""; for (var i = 0; i < firstChannel.items.length; i++) { - item = firstChannel.items[i]; + item = firstChannel.items[i]; html += ""; html += ""; html += ""; diff --git a/htroot/interactivesearch.java b/htroot/interactivesearch.java new file mode 100644 index 000000000..e5c7192fe --- /dev/null +++ b/htroot/interactivesearch.java @@ -0,0 +1,41 @@ +// interactivesearch.java +// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany +// first published 06.01.2009 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.server.serverObjects; +import de.anomic.server.serverSwitch; + +// this is a dummy class. Without it, the templates in interactivesearch.html do not load + +public class interactivesearch { + + public static serverObjects respond(final httpRequestHeader header, serverObjects post, final serverSwitch env) { + //final plasmaSwitchboard sb = (plasmaSwitchboard) env; + final serverObjects prop = new serverObjects(); + + return prop; + } +} \ No newline at end of file diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 6682a4ae4..68c8a95a5 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -399,11 +399,12 @@ public class yacysearch { prop.put("num-results_resnav", resnav.toString()); // generate the search result lines; they will be produced by another servlet - for (int i = 0; i < theQuery.displayResults(); i++) { + int m = Math.min(theQuery.displayResults(), totalcount); + for (int i = 0; i < m; i++) { prop.put("results_" + i + "_item", offset + i); prop.put("results_" + i + "_eventID", theQuery.id(false)); prop.put("results_" + i + "_display", display); - prop.put("results_" + i + "_nl", (i < theQuery.displayResults() - 1) ? 1 : 0); + prop.put("results_" + i + "_nl", (i < m - 1) ? 1 : 0); } prop.put("results", theQuery.displayResults()); prop.put("resultTable", (contentdomCode <= 1) ? "0" : "1"); diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 57a4f3376..a6e4e3d11 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -595,7 +595,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch
NameDescriptionLink
"+ item.title + "" + item.description + "" + item.link + "