diff options
| author | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2006-03-04 18:52:04 +0000 |
|---|---|---|
| committer | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2006-03-04 18:52:04 +0000 |
| commit | f0a38873ebd9575f312a8367d43c46f50595d568 (patch) | |
| tree | 125e9c06eec80e0d2576a725df5c8e0f8e8ac724 | |
| parent | eb872033c675f1e5b51ab5bd946a9922ce4af35a (diff) | |
* added yacysearch page with better view on search results
the old search page is obsolete and will be removed
* ConfigBasic.html is now the default page instead of index.html
as long as no password is set
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1815 6c8d7289-2bf4-0310-a012-ef5d649a1542
| -rw-r--r-- | htroot/ConfigBasic.java | 4 | ||||
| -rw-r--r-- | htroot/YaCySearchPluginFF.src | 2 | ||||
| -rw-r--r-- | htroot/index.html | 8 | ||||
| -rw-r--r-- | htroot/index.java | 2 | ||||
| -rw-r--r-- | htroot/websearch.html | 26 | ||||
| -rw-r--r-- | htroot/yacysearch.html | 151 | ||||
| -rw-r--r-- | htroot/yacysearch.java | 342 | ||||
| -rw-r--r-- | htroot/yacysearch.rss | 30 | ||||
| -rw-r--r-- | htroot/yacysearch.soap | 26 | ||||
| -rw-r--r-- | htroot/yacysearch.xsl | 34 | ||||
| -rw-r--r-- | source/de/anomic/plasma/plasmaSwitchboard.java | 2 | ||||
| -rw-r--r-- | source/de/anomic/plasma/plasmaWordIndexEntryContainer.java | 5 | ||||
| -rw-r--r-- | yacy.init | 2 |
13 files changed, 620 insertions, 14 deletions
diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 1fe4cd50d..09b961b76 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -133,6 +133,10 @@ public class ConfigBasic { boolean properName = (env.getConfig("peerName","").length() >= 3) && (!(yacySeed.isDefaultPeerName(env.getConfig("peerName","")))); boolean properPort = (yacyCore.seedDB.mySeed.isSenior()) || (yacyCore.seedDB.mySeed.isPrincipal()); + if ((properPW) && (env.getConfig("defaultFiles", "").startsWith("ConfigBasic.html,"))) { + env.setConfig("defaultFiles", env.getConfig("defaultFiles", "").substring(17)); + } + prop.put("statusName", (properName) ? 1 : 0); prop.put("statusPassword", (properPW) ? 1 : 0); prop.put("statusPort", (properPort) ? 1 : 0); diff --git a/htroot/YaCySearchPluginFF.src b/htroot/YaCySearchPluginFF.src index 904546a76..02a0196c9 100644 --- a/htroot/YaCySearchPluginFF.src +++ b/htroot/YaCySearchPluginFF.src @@ -4,7 +4,7 @@ name="YaCy"
description="YaCy P2P Websearch"
method="GET"
- action="http://#[host]#:#[port]#/index.html"
+ action="http://#[host]#:#[port]#/yacysearch.html"
queryEncoding="utf-8"
queryCharset="utf-8"
>
diff --git a/htroot/index.html b/htroot/index.html index cf26b7ea7..220a39ac7 100644 --- a/htroot/index.html +++ b/htroot/index.html @@ -3,7 +3,7 @@ <head>
<title>YaCy '#[clientname]#': Search Page</title>
#%env/templates/metas.template%#
- <link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="index.rss?search=#[former]#">
+ <link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="yacysearch.rss?search=#[former]#">
<script src="/js/ajax.js"></script>
<script src="/js/xml.js"></script>
@@ -26,7 +26,7 @@ picPlus.src = "/env/grafics/plus.gif"; <center><span style="font-size=12pt; font-family:Helvetica, Arial; color:#212942"><img src="/env/grafics/kaskelix.png" align="middle" alt="Kaskelix - the YaCy logo"><br>P2P WEB SEARCH</span></center><br>
<center>#[promoteSearchPageGreeting]#</center><br>
- <form action="index.html" method="get">
+ <form action="yacysearch.html" method="get">
<center>
<table border="0" cellspacing="0" cellpadding="0">
@@ -141,14 +141,14 @@ then please run your own peer and start a crawl of your wanted information to ma available for everyone. Then stay online to support crawls from other peers. Thank you!</p>
::
<b>#[linkcount]#</b> results from <b>#[orderedcount]#</b> ordered links of a total number of <b>#[totalcount]#</b> known.
-→ <a href="/index.html?search=#[former]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=.*">Catch up more links</a>
+→ <a href="/yacysearch.html?search=#[former]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=.*">Catch up more links</a>
from 'late' peers.
#(/num-results)#
#(combine)#
::
<br><br><b>Topwords</b> (to refine search):
#{words}#
-<a href="index.html?search=#[newsearch]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#">#[word]#</a>
+<a href="yacysearch.html?search=#[newsearch]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#">#[word]#</a>
#{/words}#
#(/combine)#
</p>
diff --git a/htroot/index.java b/htroot/index.java index bed7edb71..edc45f381 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -106,7 +106,7 @@ public class index { prop.put("excluded", 0);
prop.put("combine", 0);
prop.put("resultbottomline", 0);
- prop.put("count-10", 0);
+ prop.put("count-10", 1);
prop.put("count-50", 0);
prop.put("count-100", 0);
prop.put("count-1000", 0);
diff --git a/htroot/websearch.html b/htroot/websearch.html index 2a710b496..3b06405d3 100644 --- a/htroot/websearch.html +++ b/htroot/websearch.html @@ -4,6 +4,11 @@ <title>YaCy '#[clientname]#': Result Page</title>
#%env/templates/metas.template%#
<link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="index.rss?search=#[former]#">
+
+ <script src="/js/ajax.js"></script>
+ <script src="/js/xml.js"></script>
+ <script src="/js/Index.js"></script>
+
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
#%env/templates/header.template%#
@@ -13,9 +18,10 @@ picEmpty = new Image(11, 11); picEmpty.src = "/env/grafics/empty.gif";
picMinus = new Image(11, 11);
picMinus.src = "/env/grafics/minus.gif";
+picPlus = new Image(11, 11);
+picPlus.src = "/env/grafics/plus.gif";
</SCRIPT>
-
<form action="websearch.html" method="get">
<center>
<p>
@@ -92,11 +98,14 @@ from 'late' peers. #{results}#
<!-- link begin -->
<p style="border-bottom:1px #000 dashed; padding-bottom: 1em;">
+<a href="/Bookmarks_p.html?edit=#[urlhash]#" onMouseover="document.plus_#[urlhexhash]#.src=picPlus.src" onMouseout="document.plus_#[urlhexhash]#.src=picEmpty.src">
+<img src="/env/grafics/empty.gif" title="bookmark" alt="bookmark" name="plus_#[urlhexhash]#" border="0"></a>
+<span class="ResultDescription">#[description]#</span><br>
<a href="#[delete]#" onMouseover="document.minus_#[urlhexhash]#.src=picMinus.src" onMouseout="document.minus_#[urlhexhash]#.src=picEmpty.src">
-<img src="/env/grafics/empty.gif" title="delete" alt="delete" name="minus_#[urlhexhash]#" border="0"></a> <b><font color="#4070a0">#[description]#</font></b><br>
-#(snippet)#::<img src="/env/grafics/empty.gif"> <i>#[text]#</i><br>#(/snippet)#
-<img src="/env/grafics/empty.gif"> <a href="#[url]#">#[urlname]#</a><br>
-<img src="/env/grafics/empty.gif"><font color="#007050"> #[date]#</font> | <font color="#007050">YBR-#[ybr]#</font> | <a href="ViewFile.html?urlHash=#[urlhash]#&words=#[words]#">Info</a><br>
+<img src="/env/grafics/empty.gif" title="delete" alt="delete" name="minus_#[urlhexhash]#" border="0"></a>
+<span class="#(snippet)#snippetLoading::snippetLoaded#(/snippet)#" id="#[urlhash]#">#(snippet)#loading snippet ...::#[text]##(/snippet)#</span><br>
+<img src="/env/grafics/empty.gif" border="0"> <a id="url#[urlhash]#" href="#[url]#">#[urlname]#</a><br>
+<img src="/env/grafics/empty.gif"><span class="ResultDateYBR"> #[date]#</span> | <span class="ResultDateYBR">YBR-#[ybr]#</span> | <a href="ViewFile.html?urlHash=#[urlhash]#&words=#[words]#">Info</a><br>
</p>
<!-- link end -->
#{/results}#
@@ -129,5 +138,12 @@ Architecture (C) by Michael Peter Christen, <img src="/env/grafics/mcemailh.gif"></i></center>
#%env/templates/footer.template%#
+
+<script language="JavaScript">
+
+AllSnippets();
+
+</script>
+
</body>
</html>
\ No newline at end of file diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html new file mode 100644 index 000000000..59710fdc7 --- /dev/null +++ b/htroot/yacysearch.html @@ -0,0 +1,151 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> +<html> +<head> + <title>YaCy '#[clientname]#': Search Page</title> + #%env/templates/metas.template%# + <link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="yacysearch.rss?search=#[former]#"> + + <script src="/js/ajax.js"></script> + <script src="/js/xml.js"></script> + <script src="/js/Index.js"></script> + +</head> + <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +#%env/templates/header.template%# + + <SCRIPT LANGUAGE="JavaScript"> +picEmpty = new Image(11, 11); +picEmpty.src = "/env/grafics/empty.gif"; +picMinus = new Image(11, 11); +picMinus.src = "/env/grafics/minus.gif"; +picPlus = new Image(11, 11); +picPlus.src = "/env/grafics/plus.gif"; + </SCRIPT> + + <form action="yacysearch.html" method="get"> + <center> + <p> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <td rowspan="2"> + <img border="0" src="/env/grafics/yacy.png" align="top"> + </td> + <td rowspan="2" width="5px"></td> + <td align="center"><h2><font color="#212942" face="Helvetica, Arial" size="2">P2P WEB SEARCH</font></h2></td> + <td rowspan="2" width="5px"> + </td> + <td> </td> + </tr> + <tr> + <td> + <input name="search" type="text" size="52" maxlength="80" value="#[former]#"> + </td> + <td> + <input type="submit" name="Enter" value="Search"> + </td> + </tr> + </table> + </center> + <input type="hidden" name="count" value="#[count]#"> + <input type="hidden" name="order" value="#[order]#"> + <input type="hidden" name="resource" value="#[resource]#"> + <input type="hidden" name="time" value="#[time]#"> + <input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#"> + </form> +</p><hr> + +<p> +#(excluded)# +:: +<b>The following words are stop-words and had been excluded from the search: #[stopwords]#.</b><br> +#(/excluded)# +#(num-results)# +<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br> +:: +No Results. +:: +No Results. (length of search words must be at least 3 characters) +:: +<p>No Results. If you think this is unsatisfactory then you may consider to support the global index by running your own proxy/peer. +If everybody contributes, the results will get better.</p> +<p>Other possible reasons for no result:<br> +<ul> +<li>The search time was too short. Search again with same query to catch up 'late peers'</li> +<li>There is currently no support for german umlaute. Please use ae/oe/ue instead</li> +<li>Words of length < 3 are not indexed. Please omit such words</li> +<li>YaCy tries to index singular instead of plural words. Please use the singular form</li> +<li>Only complete words are indexed, not parts of words</li> +<li>Don't use stopwords as search words</li> +<li>During this test phase the reaction time of remote peers is unknown. +Please repeat your search to see if there are late-responses from remote peers</li> +</ul></p> +<p>If you think the information you searched should exist in the global index, +then please run your own peer and start a crawl of your wanted information to make it +available for everyone. Then stay online to support crawls from other peers. Thank you!</p> +:: +<b>#[linkcount]#</b> results from <b>#[orderedcount]#</b> ordered links of a total number of <b>#[totalcount]#</b> known. +→ <a href="/yacysearch.html?search=#[former]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=.*">Catch up more links</a> +from 'late' peers. +#(/num-results)# +#(combine)# +:: +<br><br><b>Topwords</b> (to refine search): +#{words}# +<a href="yacysearch.html?search=#[newsearch]#&Enter=Search&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#">#[word]#</a> +#{/words}# +#(/combine)# +</p> +<!-- linklist begin --> + +#{results}# +<!-- link begin --> +<p style="border-bottom:1px #000 dashed; padding-bottom: 1em;"> +<a href="/Bookmarks_p.html?edit=#[urlhash]#" onMouseover="document.plus_#[urlhexhash]#.src=picPlus.src" onMouseout="document.plus_#[urlhexhash]#.src=picEmpty.src"> +<img src="/env/grafics/empty.gif" title="bookmark" alt="bookmark" name="plus_#[urlhexhash]#" border="0"></a> +<span class="ResultDescription">#[description]#</span><br> +<a href="#[delete]#" onMouseover="document.minus_#[urlhexhash]#.src=picMinus.src" onMouseout="document.minus_#[urlhexhash]#.src=picEmpty.src"> +<img src="/env/grafics/empty.gif" title="delete" alt="delete" name="minus_#[urlhexhash]#" border="0"></a> +<span class="#(snippet)#snippetLoading::snippetLoaded#(/snippet)#" id="#[urlhash]#">#(snippet)#loading snippet ...::#[text]##(/snippet)#</span><br> +<img src="/env/grafics/empty.gif" border="0"> <a id="url#[urlhash]#" href="#[url]#">#[urlname]#</a><br> +<img src="/env/grafics/empty.gif"><span class="ResultDateYBR"> #[date]#</span> | <span class="ResultDateYBR">YBR-#[ybr]#</span> | <a href="ViewFile.html?urlHash=#[urlhash]#&words=#[words]#">Info</a><br> +</p> +<!-- link end --> +#{/results}# + +<!-- linklist end --> +<p> +#(resultbottomline)# +:: +The global search resulted in #[globalresults]# link contributions from other YaCy peers. +:: +You can enrich the search results by using the 'global' option: This will search also other YaCy peers +:: +You cannot get global search results because you are not connected to another YaCy peer. +To connect you must first use the proxy. +See here for an <a href="http://www.anomic.de/AnomicHTTPProxy/Installation.html#wininst">installation guide</a>. +Alternatively, you can run the proxy in permanent online mode, which also grants global search. +To do this, press this button: +<form action="SettingsAck_p.html" method="get"> +<input type="submit" name="pmode" value="go online"> +</form> +:: +You can enrich the search results by using the 'global' option; you must also switch to online mode +(by using the proxy) to contribute to the global index. +#(/resultbottomline)# +</p><br> +<hr> +<center><i>YaCy is a GPL'ed project +with the target of implementing a P2P-based global search engine.<br> +Architecture (C) by Michael Peter Christen, +<img src="/env/grafics/mcemailh.gif"></i></center> + +#%env/templates/footer.template%# + +<script language="JavaScript"> + +AllSnippets(); + +</script> + +</body> +</html>
\ No newline at end of file diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java new file mode 100644 index 000000000..85cf31fda --- /dev/null +++ b/htroot/yacysearch.java @@ -0,0 +1,342 @@ +// yacysearch.java +// ----------------------- +// part of the AnomicHTTPD caching proxy +// (C) by Michael Peter Christen; mc@anomic.de +// first published on http://www.anomic.de +// Frankfurt, Germany, 2004 +// +// $LastChangedDate: 2006-02-20 18:50:42 +0100 (Mo, 20 Feb 2006) $ +// $LastChangedRevision: 1711 $ +// $LastChangedBy: borg-0300 $ +// +// 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 +// +// Using this software in any meaning (reading, learning, copying, compiling, +// running) means that you agree that the Author(s) is (are) not responsible +// for cost, loss of data or any harm that may be caused directly or indirectly +// by usage of this softare or this documentation. The usage of this software +// is on your own risk. The installation and usage (starting/running) of this +// software may allow other people or application to access your computer and +// any attached devices and is highly dependent on the configuration of the +// software which must be done by the user of the software; the author(s) is +// (are) also not responsible for proper configuration and usage of the +// software, even if provoked by documentation provided together with +// the software. +// +// Any changes to this file according to the GPL as documented in the file +// gpl.txt aside this file in the shipment you received can be done to the +// lines that follows this copyright notice here, but changes must not be +// done inside the copyright notive above. A re-distribution must contain +// the intact and unchanged copyright notice. +// Contributions and changes to the program code must be marked as such. +// +// You must compile this file with +// javac -classpath .:../classes yacysearch.java +// if the shell's current path is HTROOT + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Iterator; +import java.util.TreeSet; + +import de.anomic.http.httpHeader; +import de.anomic.kelondro.kelondroMSetTools; +import de.anomic.kelondro.kelondroNaturalOrder; +import de.anomic.plasma.plasmaSearchRankingProfile; +import de.anomic.plasma.plasmaSearchTimingProfile; +import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSearchQuery; +import de.anomic.plasma.plasmaSearchPreOrder; +import de.anomic.server.serverCore; +import de.anomic.server.serverDate; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; +import de.anomic.yacy.yacyCore; + +public class yacysearch { + + public static final int MAX_TOPWORDS = 16; + + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { + final plasmaSwitchboard sb = (plasmaSwitchboard) env; + + boolean global = (post == null) ? true : post.get("resource", "global").equals("global"); + final boolean indexDistributeGranted = sb.getConfig("allowDistributeIndex", "true").equals("true"); + final boolean indexReceiveGranted = sb.getConfig("allowReceiveIndex", "true").equals("true"); + if (!indexDistributeGranted || !indexReceiveGranted) { global = false; } + + // case if no values are requested + final String referer = (String) header.get("Referer"); + if (post == null || env == null) { + + // save referrer + // System.out.println("HEADER=" + header.toString()); + if (referer != null) { + URL url; + try { url = new URL(referer); } catch (MalformedURLException e) { url = null; } + if ((url != null) && (serverCore.isNotLocal(url))) { + final HashMap referrerprop = new HashMap(); + referrerprop.put("count", "1"); + referrerprop.put("clientip", header.get("CLIENTIP")); + referrerprop.put("useragent", header.get("User-Agent")); + referrerprop.put("date", (new serverDate()).toShortString(false)); + if (sb.facilityDB != null) try { sb.facilityDB.update("backlinks", referer, referrerprop); } catch (IOException e) {} + } + } + + // we create empty entries for template strings + final serverObjects prop = new serverObjects(); + prop.put("promoteSearchPageGreeting", env.getConfig("promoteSearchPageGreeting", "")); + prop.put("former", ""); + prop.put("num-results", 0); + prop.put("excluded", 0); + prop.put("combine", 0); + prop.put("resultbottomline", 0); + prop.put("count-10", 1); + prop.put("count-50", 0); + prop.put("count-100", 0); + prop.put("count-1000", 0); + prop.put("count", 10); + prop.put("order-ybr-date-quality", plasmaSearchPreOrder.canUseYBR() ? 1 : 0); + prop.put("order-ybr-quality-date", 0); + prop.put("order-date-ybr-quality", 0); + prop.put("order-quality-ybr-date", 0); + prop.put("order-date-quality-ybr", plasmaSearchPreOrder.canUseYBR() ? 0 : 1); + prop.put("order-quality-date-ybr", 0); + prop.put("order", plasmaSearchPreOrder.canUseYBR() ? "YBR-Date-Quality" : "Date-Quality-YBR"); + prop.put("resource-global", ((global) ? 1 : 0)); + prop.put("resource-local", ((global) ? 0 : 1)); + prop.put("resource", "global"); + prop.put("time-1", 0); + prop.put("time-3", 0); + prop.put("time-6", 1); + prop.put("time-10", 0); + prop.put("time-30", 0); + prop.put("time-60", 0); + prop.put("time", 6); + prop.put("results", ""); + prop.put("urlmaskoptions", 0); + prop.put("urlmaskoptions_urlmaskfilter", ".*"); + return prop; + } + + // SEARCH + // process search words + int maxDistance = Integer.MAX_VALUE; + String querystring = post.get("search", "").trim(); + if ((querystring.length() > 2) && (querystring.charAt(0) == '"') && (querystring.charAt(querystring.length() - 1) == '"')) { + querystring = querystring.substring(1, querystring.length() - 1).trim(); + maxDistance = 1; + } + if (sb.facilityDB != null) try { sb.facilityDB.update("zeitgeist", querystring, post); } catch (Exception e) {} + final TreeSet query = plasmaSearchQuery.cleanQuery(querystring); + // filter out stopwords + final TreeSet filtered = kelondroMSetTools.joinConstructive(query, plasmaSwitchboard.stopwords); + if (filtered.size() > 0) { + kelondroMSetTools.excludeDestructive(query, plasmaSwitchboard.stopwords); + } + + // if a minus-button was hit, remove a special reference first + if (post.containsKey("deleteref")) { + if (!sb.verifyAuthentication(header, true)) { + final serverObjects prop = new serverObjects(); + prop.put("AUTHENTICATE", "admin log-in"); // force log-in + return prop; + } + final String delHash = post.get("deleteref", ""); + sb.removeReferences(delHash, query); + } + + // prepare search order + final String order = post.get("order", plasmaSearchPreOrder.canUseYBR() ? "YBR-Date-Quality" : "Date-Quality-YBR"); + final int count = Integer.parseInt(post.get("count", "10")); + final long searchtime = 1000 * Long.parseLong(post.get("time", "10")); + final boolean yacyonline = ((yacyCore.seedDB != null) && + (yacyCore.seedDB.mySeed != null) && + (yacyCore.seedDB.mySeed.getAddress() != null)); + + String order1=plasmaSearchRankingProfile.ORDER_DATE; + String order2=plasmaSearchRankingProfile.ORDER_YBR; + String order3=plasmaSearchRankingProfile.ORDER_QUALITY; + if (order.startsWith("YBR")) order1 = plasmaSearchRankingProfile.ORDER_YBR; + if (order.startsWith("Date")) order1 = plasmaSearchRankingProfile.ORDER_DATE; + if (order.startsWith("Quality")) order1 = plasmaSearchRankingProfile.ORDER_QUALITY; + if (order.indexOf("-YBR-") > 0) order2 = plasmaSearchRankingProfile.ORDER_YBR; + if (order.indexOf("-Date-") > 0) order2 = plasmaSearchRankingProfile.ORDER_DATE; + if (order.indexOf("-Quality-") > 0) order2 = plasmaSearchRankingProfile.ORDER_QUALITY; + if (order.endsWith("YBR")) order3 = plasmaSearchRankingProfile.ORDER_YBR; + if (order.endsWith("Date")) order3 = plasmaSearchRankingProfile.ORDER_DATE; + if (order.endsWith("Quality")) order3 = plasmaSearchRankingProfile.ORDER_QUALITY; + String urlmask = ""; + if (post.containsKey("urlmask") && post.get("urlmask").equals("no")) { + urlmask = ".*"; + } else { + urlmask = (post.containsKey("urlmaskfilter")) ? (String) post.get("urlmaskfilter") : ".*"; + } + + // do the search + plasmaSearchQuery thisSearch = new plasmaSearchQuery(query, maxDistance, count, searchtime, urlmask, + ((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))) ? plasmaSearchQuery.SEARCHDOM_GLOBALDHT : plasmaSearchQuery.SEARCHDOM_LOCAL, + "", 20); + plasmaSearchRankingProfile ranking = new plasmaSearchRankingProfile(new String[]{order1, order2, order3}); + plasmaSearchTimingProfile localTiming = new plasmaSearchTimingProfile(4 * thisSearch.maximumTime / 10, thisSearch.wantedResults); + plasmaSearchTimingProfile remoteTiming = new plasmaSearchTimingProfile(6 * thisSearch.maximumTime / 10, thisSearch.wantedResults); + final serverObjects prop = sb.searchFromLocal(thisSearch, ranking, localTiming, remoteTiming); + + /* + final serverObjects prop = sb.searchFromLocal(query, order1, order2, count, + ((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))), + searchtime, urlmask); + */ + // remember the last search expression + env.setConfig("last-search", querystring); + // process result of search + prop.put("resultbottomline", 0); + if (filtered.size() > 0){ + prop.put("excluded", 1); + prop.put("excluded_stopwords", filtered.toString()); + } else { + prop.put("excluded", 0); + } + + if (prop == null || prop.size() == 0) { + if (post.get("search", "").length() < 3) { + prop.put("num-results", 2); // no results - at least 3 chars + } else { + prop.put("num-results", 1); //no results + } + } else { + final int linkcount = Integer.parseInt(prop.get("linkcount", "0")); + final int orderedcount = Integer.parseInt(prop.get("orderedcount", "0")); + final int totalcount = Integer.parseInt(prop.get("totalcount", "0")); + if (totalcount > 10) { + final Object[] references = (Object[]) prop.get("references", new String[0]); + prop.put("num-results", 4); + prop.put("num-results_linkcount", linkcount); + prop.put("num-results_orderedcount", orderedcount); + prop.put("num-results_totalcount", totalcount); + int hintcount = references.length; + if (hintcount > 0) { + + prop.put("combine", 1); + + final TreeSet topwords = new TreeSet(kelondroNaturalOrder.naturalOrder); + for (int i = 0; i < hintcount; i++) { + topwords.add(references[i]); + } + + // filter out the badwords + final TreeSet filteredtopwords = kelondroMSetTools.joinConstructive(topwords, plasmaSwitchboard.badwords); + if (filteredtopwords.size() > 0) { + kelondroMSetTools.excludeDestructive(topwords, plasmaSwitchboard.badwords); + } + + String word; + hintcount = 0; + final Iterator iter = topwords.iterator(); + while (iter.hasNext()) { + word = (String) iter.next(); + if (word != null) { + prop.put("combine_words_" + hintcount + "_word", word); + prop.put("combine_words_" + hintcount + "_newsearch", post.get("search", "").replace(' ', '+') + "+" + word); + prop.put("combine_words_" + hintcount + "_count", count); + prop.put("combine_words_" + hintcount + "_order", order); + prop.put("combine_words_" + hintcount + "_resource", ((global) ? "global" : "local")); + prop.put("combine_words_" + hintcount + "_time", (searchtime / 1000)); + } + prop.put("combine_words", hintcount); + if (hintcount++ > MAX_TOPWORDS) { break; } + } + } + } else { + if (totalcount == 0) { + prop.put("num-results", 3);//long + } else { + prop.put("num-results", 4); + prop.put("num-results_linkcount", linkcount); + prop.put("num-results_orderedcount", orderedcount); + prop.put("num-results_totalcount", totalcount); + } + } + } + + if (urlmask.equals(".*")) { + prop.put("urlmaskoptions", 0); + } else { + prop.put("urlmaskoptions", 1); + } + prop.put("urlmaskfilter", urlmask); + prop.put("urlmaskoptions_urlmaskfilter", urlmask); + + if (yacyonline) { + if (global) { + prop.put("resultbottomline", 1); + prop.put("resultbottomline_globalresults", prop.get("globalresults", "0")); + } else { + prop.put("resultbottomline", 2); + } + } else { + if (global) { + prop.put("resultbottomlien", 3); + } else { + prop.put("resultbottomline", 4); + } + } + + prop.put("count-10", ((count == 10)) ? 1 : 0); + prop.put("count-50", ((count == 50)) ? 1 : 0); + prop.put("count-100", ((count == 100)) ? 1 : 0); + prop.put("count-1000", ((count == 1000)) ? 1 : 0); + prop.put("count", count); + prop.put("order-ybr-date-quality", ((order.equals("YBR-Date-Quality")) ? 1 : 0)); + prop.put("order-ybr-quality-date", ((order.equals("YBR-Quality-Date")) ? 1 : 0)); + prop.put("order-date-ybr-quality", ((order.equals("Date-YBR-Quality")) ? 1 : 0)); + prop.put("order-quality-ybr-date", ((order.equals("Quality-YBR-Date")) ? 1 : 0)); + prop.put("order-date-quality-ybr", ((order.equals("Date-Quality-YBR")) ? 1 : 0)); + prop.put("order-quality-date-ybr", ((order.equals("Quality-Date-YBR")) ? 1 : 0)); + prop.put("resource-global", ((global) ? 1 : 0)); + prop.put("resource-local", ((global) ? 0 : 1)); + prop.put("resource", (global) ? "global" : "local"); + prop.put("time-1", ((searchtime == 1000) ? 1 : 0)); + prop.put("time-3", ((searchtime == 3000) ? 1 : 0)); + prop.put("time-6", ((searchtime == 6000) ? 1 : 0)); + prop.put("time-10", ((searchtime == 10000) ? 1 : 0)); + prop.put("time-30", ((searchtime == 30000) ? 1 : 0)); + prop.put("time-60", ((searchtime == 60000) ? 1 : 0)); + prop.put("time", searchtime / 1000); + prop.put("former", post.get("search", "")); + prop.put("order", order); + + // 'enrich search' variables + prop.put("num-results_former", post.get("search", "")); + prop.put("num-results_time", searchtime / 1000); + prop.put("num-results_count", count); + prop.put("num-results_resource", (global) ? "global" : "local"); + prop.put("num-results_order", order); + + // return rewrite properties + prop.put("promoteSearchPageGreeting", env.getConfig("promoteSearchPageGreeting", "")); + + // adding some additional properties needed for the rss feed + String hostName = (String) header.get("Host","localhost"); + if (hostName.indexOf(":") == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port","8080")); + prop.put("rssYacyImageURL","http://" + hostName + "/env/grafics/yacy.gif"); + + return prop; + } + +} diff --git a/htroot/yacysearch.rss b/htroot/yacysearch.rss new file mode 100644 index 000000000..e61d500ae --- /dev/null +++ b/htroot/yacysearch.rss @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<?xml-stylesheet type='text/xsl' href='/yacysearch.xsl' version='1.0'?> +<rss version="2.0" xmlns:yacyTopwords="http://www.yacy.net/yacy/topwords"> + <channel> + <title>Search for #[former]#</title> + <description>Search for #[former]#</description> + <image> + <url>#[rssYacyImageURL]#</url> + <title>Search for #[former]#</title> + </image> + #{results}# + <item> + <title>#[description]#</title> + <link>#[url]#</link> + #(snippet)#::<description>#[text]#</description>#(/snippet)# + <pubDate>#[date]#</pubDate> + </item> + #{/results}# + <yacyTopwords:topwords> + #(combine)# + :: + #{words}# + <yacyTopwords:item> + <yacyTopwords:word>#[word]#</yacyTopwords:word> + </yacyTopwords:item> + #{/words}# + #(/combine)# + </yacyTopwords:topwords> + </channel> +</rss> diff --git a/htroot/yacysearch.soap b/htroot/yacysearch.soap new file mode 100644 index 000000000..7d1a5ab0e --- /dev/null +++ b/htroot/yacysearch.soap @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<yacySearch> + <yacySearchResult> + <title>Search for #[former]#</title> + <description>Search for #[former]#</description> + + <totalResultCount>#[totalcount]#</totalResultCount> + <currentResultCount>#[linkcount]#</currentResultCount> + + <searchTips> + #(combine)#:: + #{words}#<searchTip query="#[newsearch]#">#[word]#</searchTip>#{/words}# + #(/combine)# + </searchTips> + + #{results}# + <yacySearchResultItem> + <description>#[description]#</description> + <link>#[url]#</link> + <linkName>#[urlname]#</linkName> + <date>#[date]#</date> + <size>#[size]#</size> + </yacySearchResultItem> + #{/results}# + </yacySearchResult> +</yacySearch> diff --git a/htroot/yacysearch.xsl b/htroot/yacysearch.xsl new file mode 100644 index 000000000..cd064375f --- /dev/null +++ b/htroot/yacysearch.xsl @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8" ?> +<?xml-stylesheet type='text/xsl' href='/rss.xsl' version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.0"> + <xsl:template match='/rss'> + <html> + <head> + <title><xsl:value-of select='channel/title' /></title> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <link rel="shortcut icon" href="favicon.ico" /> + <style type="text/css"> + @import "/env/style.css"; + </style> + </head> + <body> + <div align="center"> + <img src="/env/grafics/kaskelix.png"/><br/> + <h1><xsl:value-of select='channel/title' /></h1> + </div> + <p> + <xsl:apply-templates select='channel/item' /> + </p> + </body> + </html> + </xsl:template> + + <xsl:template match='item'> + <p> + <b><xsl:value-of select='title'/></b><br/> + <a href="{link}" ><xsl:value-of select='link' /></a><br/> + <xsl:value-of select='pubDate' /><br/> + </p> + </xsl:template> + +</xsl:stylesheet>
\ No newline at end of file diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 90bcab158..efd56f178 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -1858,7 +1858,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser if (snippet.source == plasmaSnippetCache.ERROR_NO_MATCH) {
// suppress line: there is no match in that resource
} else {
- prop.put("results_" + i + "_delete", "/index.html?search=" + formerSearch + "&Enter=Search&count=" + query.wantedResults + "&order=" + ranking.orderString() + "&resource=local&time=3&deleteref=" + urlhash + "&urlmaskfilter=.*");
+ prop.put("results_" + i + "_delete", "/yacysearch.html?search=" + formerSearch + "&Enter=Search&count=" + query.wantedResults + "&order=" + ranking.orderString() + "&resource=local&time=3&deleteref=" + urlhash + "&urlmaskfilter=.*");
prop.put("results_" + i + "_description", descr);
prop.put("results_" + i + "_url", urlstring);
prop.put("results_" + i + "_urlhash", urlhash);
diff --git a/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java b/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java index a594d294c..30978569c 100644 --- a/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java +++ b/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java @@ -52,6 +52,7 @@ package de.anomic.plasma; +import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Set; import java.util.TreeMap; @@ -121,7 +122,9 @@ public final class plasmaWordIndexEntryContainer { Iterator i = c.entries(); int x = 0; while (i.hasNext()) { - if (addi((plasmaWordIndexEntry) i.next())) x++; + try { + if (addi((plasmaWordIndexEntry) i.next())) x++; + } catch (ConcurrentModificationException e) {} } this.updateTime = java.lang.Math.max(this.updateTime, c.updateTime); return x; @@ -45,7 +45,7 @@ htDocsPath = DATA/HTDOCS # The complete path to this file is created by combination with the rootPath
# you can set a list of defaults, separated by comma
# the first one is priorized
-defaultFiles = index.html,default.html,search.html,console.html,control.html,welcome.html,wiki.html,forum.html,blog.html,email.html,content.html,monitor.html,share.html,dir.html,readme.txt
+defaultFiles = ConfigBasic.html,index.html,default.html,search.html,console.html,control.html,welcome.html,wiki.html,forum.html,blog.html,email.html,content.html,monitor.html,share.html,dir.html,readme.txt
# locale-options: YaCy supports localization.
# Web pages for special languages are located in the htLocalePath
|