added detailed search.

ranking profiles do not work properly yet

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1551 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 19 years ago
parent c695928f7c
commit 0cb940a8e5

@ -0,0 +1,194 @@
<!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="index.rss?search=#[former]#">
</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";
</SCRIPT>
<form action="DetailedSearch.html" method="get" enctype="multipart/form-data">
<table border="0" cellpadding="5" cellspacing="0">
<tr heigth="1"><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
<tr valign="center" class="TableCellLight">
<td><h2>Detailed&nbsp;Search</h2></td>
<td colspan="2"><input type="text" name="search" value="#[search]#" size="50" maxlength="250"></td>
<td><input type="submit" name="Enter" value="Search"></td>
</tr>
<tr valign="top" class="TableCellLight">
<td colspan="2">
<table border="0" cellpadding="0" cellspacing="1">
<tr valign="center" class="TableHeader"><td class="small" colspan="2">Local Query</td></tr>
<tr valign="center" class="TableCellDark">
<td class=small>Max. number of results:</td>
<td class=small>
<input type="text" name="localCount" value="#[localCount]#" size="4" maxlength="5">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Max. search time (seconds):</td>
<td class=small>
<input type="text" name="localTime" value="#[localTime]#" size="2" maxlength="3">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Max. word distance:</td>
<td class=small>
<input type="text" name="localWDist" value="#[localWDist]#" size="3" maxlength="4">
</td>
</tr>
<tr valign="center"><td class="small" colspan="2">&nbsp;</td></tr>
<tr valign="center" class="TableHeader"><td class="small" colspan="2">Local Ranking</td></tr>
<tr valign="center" class="TableCellDark">
<td class=small>Entropy</td>
<td class=small>
<input type="text" name="localentropy" value="#[localentropy]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Date</td>
<td class=small>
<input type="text" name="localdate" value="#[localdate]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>YBR</td>
<td class=small>
<input type="text" name="localybr" value="#[localybr]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Position in Text</td>
<td class=small>
<input type="text" name="localposintext" value="#[localposintext]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Word Sistance</td>
<td class=small>
<input type="text" name="localworddistance" value="#[localworddistance]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Word Hit Count</td>
<td class=small>
<input type="text" name="localhitcount" value="#[localhitcount]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Domain Length</td>
<td class=small>
<input type="text" name="localdomlength" value="#[localdomlength]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>URL Length</td>
<td class=small>
<input type="text" name="localurllength" value="#[localurllength]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>URL Components</td>
<td class=small>
<input type="text" name="localurlcomps" value="#[localurlcomps]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Description Length</td>
<td class=small>
<input type="text" name="localdescrlength" value="#[localdescrlength]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Description Components</td>
<td class=small>
<input type="text" name="localdescrcomps" value="#[localdescrcomps]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Query appears in URL</td>
<td class=small>
<input type="text" name="localqueryinurl" value="#[localqueryinurl]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Query appears in Description</td>
<td class=small>
<input type="text" name="localqueryindescr" value="#[localqueryindescr]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>URL Component appears in Toplist</td>
<td class=small>
<input type="text" name="localurlcompintoplist" value="#[localurlcompintoplist]#" size="2" maxlength="2">
</td>
</tr>
<tr valign="center" class="TableCellDark">
<td class=small>Description Component appears in Toplist</td>
<td class=small>
<input type="text" name="localdescrcompintoplist" value="#[localdescrcompintoplist]#" size="2" maxlength="2">
</td>
</tr>
</table>
</td>
<td colspan="2">
<table border="0" cellpadding="0" cellspacing="1">
<tr valign="center" class="TableHeader"><td class="small" colspan="2">Global Query</td></tr>
<tr valign="center" class="TableCellDark">
<td class=small colspan="2">Global:
<input type="checkbox" name="global" align="top" #[globalChecked]#>
</td>
</tr>
<tr valign="top" class="TableCellDark"><td class=small colspan="2"><i>(to be filled with more global options)</i></td></tr>
</table></td>
</tr>
</table>
</form>
<p>
#(excluded)#
::
<b>The following words are stop-words and had been excluded from the search: #[stopwords]#.</b>
#(/excluded)#
#(num-results)#
::
<b>#[linkcount]#</b> results from <b>#[orderedcount]#</b> ordered links of a total number of <b>#[totalcount]#</b> known.
&rarr; <a href="/DetailedSearch.html?search=#[former]#&Enter=Search&count=#[count]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=.*#[ranking]#">Catch up more links</a>
from 'late' peers.
#(/num-results)#
#(combine)#
::
<br><br><b>Topwords</b> (to refine search):
#{words}#
<a href="DetailedSearch.html?search=#[newsearch]#&Enter=Search&count=#[count]#&resource=#[resource]#&time=#[time]##[ranking]#">#[word]#</a>
#{/words}#
#(/combine)#
</p>
<!-- linklist begin -->
#{results}#
<!-- link begin -->
<p style="border-bottom:1px #000 dashed; padding-bottom: 1em;">
<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>&nbsp;<b><font color="#4070a0">#[description]#</font></b><br>
#(snippet)#::<img src="/env/grafics/empty.gif">&nbsp;<i>#[text]#</i><br>#(/snippet)#
<img src="/env/grafics/empty.gif">&nbsp;<a href="#[url]#">#[urlname]#</a><br>
<img src="/env/grafics/empty.gif"><font color="#007050">&nbsp;#[date]#</font> | <font color="#007050">YBR-#[ybr]#</font> | <a href="ViewFile.html?urlHash=#[urlhash]#&words=#[words]#">Info</a><br>
</p>
<!-- link end -->
#{/results}#
<!-- linklist end -->
<p>
</p><br>
#%env/templates/footer.template%#
</body>
</html>

@ -0,0 +1,218 @@
// DetailedSearch.java
// -----------------------
// part of the AnomicHTTPD caching proxy
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2006
//
// $LastChangedDate: 2006-02-05 16:38:31 +0100 (So, 05 Feb 2006) $
// $LastChangedRevision: 1548 $
// $LastChangedBy: orbiter $
//
// 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 index.java
// if the shell's current path is HTROOT
import java.util.TreeSet;
import de.anomic.http.httpHeader;
import de.anomic.kelondro.kelondroMSetTools;
import de.anomic.plasma.plasmaSearchRankingProfile;
import de.anomic.plasma.plasmaSearchTimingProfile;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.plasma.plasmaSearchQuery;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
import de.anomic.yacy.yacyCore;
public class DetailedSearch {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
final plasmaSwitchboard sb = (plasmaSwitchboard) env;
// case if no values are requested
if (post == null || env == null) {
// we create empty entries for template strings
final serverObjects prop = new serverObjects();
prop.put("promoteSearchPageGreeting", env.getConfig("promoteSearchPageGreeting", ""));
prop.put("search", "");
prop.put("num-results", 0);
prop.put("excluded", 0);
prop.put("combine", 0);
prop.put("resultbottomline", 0);
prop.put("localCount", 10);
prop.put("localWDist", 999);
prop.put("globalChecked", "checked");
prop.put("localTime", 6);
prop.put("results", "");
prop.put("urlmaskoptions", 0);
prop.put("urlmaskoptions_urlmaskfilter", ".*");
String defaultRankingProfile = new plasmaSearchRankingProfile().toExternalString();
prop.putAll(new plasmaSearchRankingProfile("", defaultRankingProfile).toExternalMap("local"));
return prop;
}
boolean global = (post == null) ? false : post.get("global", "").equals("on");
final boolean indexDistributeGranted = sb.getConfig("allowDistributeIndex", "true").equals("true");
final boolean indexReceiveGranted = sb.getConfig("allowReceiveIndex", "true").equals("true");
if (!indexDistributeGranted || !indexReceiveGranted) { global = false; }
int wdist = Integer.parseInt(post.get("localWDist", "999"));
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();
wdist = 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 int count = Integer.parseInt(post.get("localCount", "10"));
final long searchtime = 1000 * Long.parseLong(post.get("localTime", "10"));
final boolean yacyonline = ((yacyCore.seedDB != null) &&
(yacyCore.seedDB.mySeed != null) &&
(yacyCore.seedDB.mySeed.getAddress() != null));
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, wdist, count, searchtime, urlmask,
((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))) ? plasmaSearchQuery.SEARCHDOM_GLOBALDHT : plasmaSearchQuery.SEARCHDOM_LOCAL,
"", 20);
plasmaSearchRankingProfile localRanking = new plasmaSearchRankingProfile("local", post.toString());
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, localRanking, localTiming, remoteTiming);
// 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) {
prop.put("num-results", 0);
} 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"));
final Object[] references = (Object[]) prop.get("references", new String[0]);
prop.put("num-results", 1);
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) {
if (hintcount > 16) { hintcount = 16; }
prop.put("combine", 1);
String word;
for (int i = 0; i < hintcount; i++) {
word = (String) references[i];
if (word != null) {
prop.put("combine_words_" + i + "_word", word);
prop.put("combine_words_" + i + "_newsearch", post.get("search", "").replace(' ', '+') + "+" + word);
prop.put("combine_words_" + i + "_count", count);
prop.put("combine_words_" + i + "_ranking", localRanking.toExternalURLGet("local").toString());
prop.put("combine_words_" + i + "_resource", ((global) ? "global" : "local"));
prop.put("combine_words_" + i + "_time", (searchtime / 1000));
}
prop.put("combine_words", i);
}
}
}
if (urlmask.equals(".*")) {
prop.put("urlmaskoptions", 0);
} else {
prop.put("urlmaskoptions", 1);
}
prop.put("urlmaskoptions_urlmaskfilter", urlmask);
prop.put("localCount", count);
prop.put("localWDist", wdist);
prop.put("globalChecked", (global) ? "checked" : "");
prop.put("localTime", searchtime/1000);
prop.put("search", post.get("search", ""));
prop.putAll(localRanking.toExternalMap("local"));
// '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_ranking", localRanking.toExternalURLGet("local").toString());
// 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 += ":" + env.getConfig("port","8080");
prop.put("rssYacyImageURL","http://" + hostName + "/env/grafics/yacy.gif");
return prop;
}
}

@ -33,6 +33,7 @@
<table width="100%" border="0" cellspacing="2" cellpadding="0" class="Menu">
<tr><td class="MenuHeader">&nbsp;Global&nbsp;Index</td></tr>
<tr><td class="MenuItem">&nbsp;<a href="/index.html" accesskey="s" class="MenuItemLink">Search Page</a></td></tr>
<tr><td class="MenuItem">&nbsp;<a href="/DetailedSearch.html" class="MenuItemLink">Detailed Search</a></td></tr>
<tr><td class="MenuItem">&nbsp;<a href="/Help.html" class="MenuItemLink">Help</a></td></tr>
<!--<tr><td class="MenuItem">&nbsp;<a href="/Statistics.html" class="MenuItemLink">Statistics</a></td></tr>-->
<tr><td class="MenuSpacer"></td></tr>

@ -98,13 +98,15 @@ public class plasmaSearchRankingProfile {
coeff.put(DESCRCOMPINTOPLIST, new Integer(11));
}
public plasmaSearchRankingProfile(String profile) {
public plasmaSearchRankingProfile(String prefix, String profile) {
this(); // set defaults
//parse external form
String[] elts = profile.substring(1, profile.length() - 1).split(",");
int p;
int s = prefix.length();
for (int i = 0; i < elts.length; i++) {
coeff.put(elts[i].substring(0, (p = elts[i].indexOf("="))), elts[i].substring(p + 1));
if ((s == 0) || (elts[i].startsWith(prefix)))
coeff.put(elts[i].substring(s, (p = elts[i].indexOf("="))), elts[i].substring(p + 1));
}
}
@ -120,15 +122,38 @@ public class plasmaSearchRankingProfile {
}
public String orderString() {
if (order == null) return "YBR-Date-Quality";
return order[0] + "-" + order[1] + "-" + order[2];
}
public String toExternalForm() {
public String toExternalString() {
return coeff.toString();
}
public Map coeff() {
return this.coeff;
public Map toExternalMap(String prefix) {
Iterator i = this.coeff.entrySet().iterator();
Map.Entry entry;
Map ext = new HashMap();
while (i.hasNext()) {
entry = (Map.Entry) i.next();
ext.put(prefix + (String) entry.getKey(), entry.getValue());
}
return ext;
}
public String toExternalURLGet(String prefix) {
Iterator i = this.coeff.entrySet().iterator();
Map.Entry entry;
StringBuffer ext = new StringBuffer();
while (i.hasNext()) {
entry = (Map.Entry) i.next();
ext.append("&");
ext.append(prefix);
ext.append((String) entry.getKey());
ext.append("=");
ext.append(entry.getValue());
}
return new String(ext);
}
public long preRanking(plasmaWordIndexEntry normalizedEntry) {

Loading…
Cancel
Save