Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

added time-out option parameter to call hierarchy

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2691 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2006-10-02 09:40:18 +00:00
parent b59d4576af
commit dbc2e039bb
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htroot/xml/snippet.java
View File

@ -39,7 +39,7 @@ public class snippet {
// do the search // do the search
Set queryHashes = plasmaSearchQuery.words2hashes(query); Set queryHashes = plasmaSearchQuery.words2hashes(query);
plasmaSnippetCache.Snippet snippet = switchboard.snippetCache.retrieveSnippet(url, queryHashes, true, 260); plasmaSnippetCache.Snippet snippet = switchboard.snippetCache.retrieveSnippet(url, queryHashes, true, 260, 10000);
prop.put("status",snippet.getSource()); prop.put("status",snippet.getSource());
if (snippet.getSource() < 11) { if (snippet.getSource() < 11) {
//prop.put("text", (snippet.exists()) ? snippet.getLineMarked(queryHashes) : "unknown"); //prop.put("text", (snippet.exists()) ? snippet.getLineMarked(queryHashes) : "unknown");

2
htroot/yacy/search.java
View File

@ -202,7 +202,7 @@ public final class search {
while ((acc.hasMoreElements()) && (i < squery.wantedResults)) { while ((acc.hasMoreElements()) && (i < squery.wantedResults)) {
urlentry = acc.nextElement(); urlentry = acc.nextElement();
if (includesnippet) { if (includesnippet) {
snippet = sb.snippetCache.retrieveSnippet(urlentry.url(), squery.queryHashes, false, 260); snippet = sb.snippetCache.retrieveSnippet(urlentry.url(), squery.queryHashes, false, 260, 1000);
} else { } else {
snippet = null; snippet = null;
} }

12
source/de/anomic/plasma/plasmaSnippetCache.java
View File

@ -166,7 +166,7 @@ public class plasmaSnippetCache {
return retrieveFromCache(hashes, indexURL.urlHash(url)) != null; return retrieveFromCache(hashes, indexURL.urlHash(url)) != null;
} }
public Snippet retrieveSnippet(URL url, Set queryhashes, boolean fetchOnline, int snippetMaxLength) { public Snippet retrieveSnippet(URL url, Set queryhashes, boolean fetchOnline, int snippetMaxLength, int timeout) {
// heise = "0OQUNU3JSs05" // heise = "0OQUNU3JSs05"
if (queryhashes.size() == 0) { if (queryhashes.size() == 0) {
//System.out.println("found no queryhashes for URL retrieve " + url); //System.out.println("found no queryhashes for URL retrieve " + url);
@ -196,7 +196,7 @@ public class plasmaSnippetCache {
// if not found try to download it // if not found try to download it
if ((resource == null) && (fetchOnline)) { if ((resource == null) && (fetchOnline)) {
// download resource using the crawler // download resource using the crawler
plasmaHTCache.Entry entry = loadResourceFromWeb(url, 5000); plasmaHTCache.Entry entry = loadResourceFromWeb(url, timeout);
// getting resource metadata (e.g. the http headers for http resources) // getting resource metadata (e.g. the http headers for http resources)
if (entry != null) docInfo = entry.getDocumentInfo(); if (entry != null) docInfo = entry.getDocumentInfo();
@ -552,7 +552,7 @@ public class plasmaSnippetCache {
urlstring = urlentry.url().toNormalform(); urlstring = urlentry.url().toNormalform();
if ((urlstring.matches(urlmask)) && if ((urlstring.matches(urlmask)) &&
(!(existsInCache(urlentry.url(), queryhashes)))) { (!(existsInCache(urlentry.url(), queryhashes)))) {
new Fetcher(urlentry.url(), queryhashes).start(); new Fetcher(urlentry.url(), queryhashes, (int) maxTime).start();
i++; i++;
} }
} }
@ -561,14 +561,16 @@ public class plasmaSnippetCache {
public class Fetcher extends Thread { public class Fetcher extends Thread {
URL url; URL url;
Set queryhashes; Set queryhashes;
public Fetcher(URL url, Set queryhashes) { int timeout;
public Fetcher(URL url, Set queryhashes, int timeout) {
if (url.getHost().endsWith(".yacyh")) return; if (url.getHost().endsWith(".yacyh")) return;
this.url = url; this.url = url;
this.queryhashes = queryhashes; this.queryhashes = queryhashes;
this.timeout = timeout;
} }
public void run() { public void run() {
log.logFine("snippetFetcher: try to get URL " + url); log.logFine("snippetFetcher: try to get URL " + url);
plasmaSnippetCache.Snippet snippet = retrieveSnippet(url, queryhashes, true, 260); plasmaSnippetCache.Snippet snippet = retrieveSnippet(url, queryhashes, true, 260, timeout);
if (snippet.line == null) if (snippet.line == null)
log.logFine("snippetFetcher: cannot get URL " + url + ". error(" + snippet.source + "): " + snippet.error); log.logFine("snippetFetcher: cannot get URL " + url + ". error(" + snippet.source + "): " + snippet.error);
else else

2
source/de/anomic/plasma/plasmaSwitchboard.java
View File

@ -2078,7 +2078,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
URL wordURL; URL wordURL;
if (urlstring.matches(query.urlMask)) { //.* is default if (urlstring.matches(query.urlMask)) { //.* is default
if (includeSnippets) { if (includeSnippets) {
snippet = snippetCache.retrieveSnippet(url, query.queryHashes, false, 260); snippet = snippetCache.retrieveSnippet(url, query.queryHashes, false, 260, 1000);
} else { } else {
snippet = null; snippet = null;
} }