- added some settings and statistics for url-fetcher 'server'-mode - added own stack for fetchable URLs - added possibility to fill stack via shift from peer's queues, via POST (addurls=$count and url$num=$url) or via file-upload - added "htroot" to classpath of linux start-script git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3370 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
karlchenofhell
18 years ago
parent
a46dc43f45
commit
d114a0136e
@ -0,0 +1,70 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': URL Fetcher Stack Management</title>
|
||||
#%env/templates/metas.template%#
|
||||
</head>
|
||||
<body id="CrawlURLFetchStack_p">
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuCrawlURLFetch.template%#
|
||||
<h2>Manage stack for remote URL fetches</h2>
|
||||
|
||||
#(addedUrls)#::<span class="success">Added #[added]# URLs!</span>#(/addedUrls)#
|
||||
<form method="post" action="CrawlURLFetchStack_p.html" enctype="multipart/form-data">
|
||||
<fieldset><legend>Statistics</legend>
|
||||
<dl>
|
||||
<dt>Currently stacked URLs:</dt><dd>#[urlCount]#</dd>
|
||||
<dt>Totally fetched / added URLs:</dt><dd>#[totalFetched]# / #[totalAdded]#</dd>
|
||||
#{peers}#
|
||||
<dt>Fetched from #[peer]#</dt><dd>#[amount]#</dd>#{/peers}#
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<fieldset><legend>Settings</legend>
|
||||
<dl>
|
||||
<dt><label for="maxSize">Maximum URLs for each transfer</label>:</dt>
|
||||
<dd>
|
||||
<input type="text" name="maxSize" id="maxSize" value="#[maxSize]#" maxlength="3" size="3" />
|
||||
<input type="submit" name="setMaxSize" value="Set" />
|
||||
#(set)#::
|
||||
<span class="success">Set max. size for each transfer to #[value]#</span>::
|
||||
<span class="error">Setting max. size for each transfer to #[value]# was unsuccessful: may not be negative</span>#(/set)#
|
||||
</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<fieldset><legend>Add URLs to stack</legend>
|
||||
<dt><label for="shiftloc">Shift URLs from Local Crawler</label>:</dt>
|
||||
<dd>
|
||||
<input type="text" name="shiftloc" id="shiftloc" value="#[locurlsVal]#" size="5" maxlength="5" style="text-align: right;" />
|
||||
of <span class="tt">#[locurls]#</span> URLs
|
||||
<input type="submit" name="shiftlcq" value="Shift" />
|
||||
#(shiftloc)#::
|
||||
<span class="success">Shifted #[value]# URLs from Local Crawler Queue to URL Fetcher Stack</span>::
|
||||
<span class="error">Shifting URLs from Local Crawler Queue to URL Fetcher Stack was unsuccessful: #[error]#</span>#(/shiftloc)#
|
||||
</dd>
|
||||
<dt><label for="shiftrem">Shift URLs from Remote Crawler</label>:</dt>
|
||||
<dd>
|
||||
<input type="text" name="shiftrem" id="shiftrem" value="#[remurlsVal]#" size="5" maxlength="5" style="text-align: right;" />
|
||||
of <span class="tt">#[remurls]#</span> URLs
|
||||
<input type="submit" name="shiftrcq" value="Shift" />
|
||||
#(shiftrem)#::
|
||||
<span class="success">Shifted #[value]# URLs from Remote Crawler Queue to URL Fetcher Stack</span>::
|
||||
<span class="error">Shifting URLs from Remote Crawler Queue to URL Fetcher Stack was unsuccessful: #[error]#</span>#(/shiftrem)#
|
||||
</dd>
|
||||
<dt><label for="upload">Upload URL-List</label>:</dt>
|
||||
<dd>
|
||||
<input type="file" name="upload" id="upload" /> #(uploadError)#:: <span class="error">No file entered for upload</span>#(/uploadError)#<br />
|
||||
<input type="radio" name="uploadType" id="plain" value="plain" checked="checked" /> <label for="plain">Plain text, line-seperated</label><br />
|
||||
<input type="radio" name="uploadType" id="html" value="html" disabled="disabled" /> <label for="html">HTML file, links will be added</label><br />
|
||||
<input type="submit" name="subupload" value="Upload File" />
|
||||
#(upload)#::
|
||||
<span class="success">Added #[added]# and rejected #[failed]# URLs from uploaded file successfully</span>::
|
||||
<span class="error">An internal error occured processing the uploaded file: #[error]#</span>#(/upload)#
|
||||
</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
</form>
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,216 @@
|
||||
// CrawlURLFetchStack_p.java
|
||||
// -------------------------------------
|
||||
// part of YACY
|
||||
//
|
||||
// (C) 2007 by Franz Brausse
|
||||
//
|
||||
// last change: $LastChangedDate: $ by $LastChangedBy: $
|
||||
//
|
||||
// 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.
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.Writer;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
|
||||
import de.anomic.data.URLFetcherStack;
|
||||
import de.anomic.htmlFilter.htmlFilterContentScraper;
|
||||
import de.anomic.htmlFilter.htmlFilterWriter;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.plasma.plasmaCrawlNURL;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverFileUtils;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.server.logging.serverLog;
|
||||
|
||||
public class CrawlURLFetchStack_p {
|
||||
|
||||
public static final HashMap /* of PeerName, sent URLs */ fetchMap = new HashMap();
|
||||
private static URLFetcherStack stack = null;
|
||||
public static int maxURLsPerFetch = 50;
|
||||
|
||||
public static URLFetcherStack getURLFetcherStack(serverSwitch env) {
|
||||
if (stack == null) try {
|
||||
stack = new URLFetcherStack(env.getConfig(plasmaSwitchboard.DBPATH, plasmaSwitchboard.DBPATH_DEFAULT));
|
||||
} catch (IOException e) {
|
||||
serverLog.logSevere("URLFETCHER", "Couldn't initialize URL stack: " + e.getMessage());
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
||||
final serverObjects prop = new serverObjects();
|
||||
plasmaSwitchboard sb = (plasmaSwitchboard)env;
|
||||
|
||||
if (post != null) {
|
||||
if (post.containsKey("addurls")) {
|
||||
prop.put("addedUrls", 1);
|
||||
prop.put("addedUrls_added", addURLs(post, post.getInt("addurls", -1), getURLFetcherStack(env)));
|
||||
}
|
||||
else if (post.containsKey("setMaxSize")) {
|
||||
final int count = post.getInt("maxSize", maxURLsPerFetch);
|
||||
if (count > 0) {
|
||||
maxURLsPerFetch = count;
|
||||
prop.put("set", 1);
|
||||
prop.put("set_value", maxURLsPerFetch);
|
||||
} else {
|
||||
prop.put("set", 2);
|
||||
prop.put("set_value", count);
|
||||
}
|
||||
}
|
||||
else if (post.containsKey("shiftlcq")) {
|
||||
int count = Math.min(post.getInt("shiftloc", 0), sb.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE));
|
||||
try {
|
||||
shiftFromNotice(sb.noticeURL, plasmaCrawlNURL.STACK_TYPE_CORE, getURLFetcherStack(env), count);
|
||||
prop.put("shiftloc", 1);
|
||||
prop.put("shiftloc_value", count);
|
||||
} catch (IOException e) {
|
||||
prop.put("shiftloc", 2);
|
||||
prop.put("shiftloc_error", e.getMessage());
|
||||
}
|
||||
}
|
||||
else if (post.containsKey("shiftrcq")) {
|
||||
int count = post.getInt("shiftrem", 0);
|
||||
try {
|
||||
shiftFromNotice(sb.noticeURL, plasmaCrawlNURL.STACK_TYPE_LIMIT, getURLFetcherStack(env), count);
|
||||
prop.put("shiftrem", 1);
|
||||
prop.put("shiftrem_value", count);
|
||||
} catch (IOException e) {
|
||||
prop.put("shiftrem", 2);
|
||||
prop.put("shiftrem_error", e.getMessage());
|
||||
}
|
||||
}
|
||||
else if (post.containsKey("subupload")) {
|
||||
if (post.get("upload", "").length() == 0) {
|
||||
prop.put("uploadError", 1);
|
||||
} else {
|
||||
final File file = new File(post.get("upload", ""));
|
||||
final String content = new String((byte[])post.get("upload$file"));
|
||||
|
||||
final String type = post.get("uploadType", "");
|
||||
if (type.equals("plain")) {
|
||||
prop.put("upload_added", addURLs(content.split("\n"), getURLFetcherStack(env)));
|
||||
prop.put("upload_failed", 0);
|
||||
prop.put("upload", 1);
|
||||
} else if (type.equals("html")) {
|
||||
try {
|
||||
final htmlFilterContentScraper scraper = new htmlFilterContentScraper(new URL(file));
|
||||
final Writer writer = new htmlFilterWriter(null, null, scraper, null, false);
|
||||
serverFileUtils.write(content, writer);
|
||||
writer.close();
|
||||
|
||||
final Iterator it = ((HashMap)scraper.getAnchors()).keySet().iterator();
|
||||
int added = 0, failed = 0;
|
||||
String url;
|
||||
while (it.hasNext()) try {
|
||||
url = (String)it.next();
|
||||
getURLFetcherStack(env).push(new URL(url));
|
||||
added++;
|
||||
} catch (MalformedURLException e) { failed++; }
|
||||
prop.put("upload", 1);
|
||||
prop.put("upload_added", added);
|
||||
prop.put("upload_failed", failed);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
prop.put("upload", 2);
|
||||
prop.put("upload_error", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
putFetched(prop);
|
||||
prop.put("urlCount", getURLFetcherStack(env).size());
|
||||
prop.put("totalFetched", getURLFetcherStack(env).getPopped());
|
||||
prop.put("totalAdded", getURLFetcherStack(env).getPushed());
|
||||
prop.put("maxSize", maxURLsPerFetch);
|
||||
prop.put("locurls", sb.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE));
|
||||
prop.put("remurls", sb.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT));
|
||||
prop.put("locurlsVal", Math.min(sb.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE), 500));
|
||||
prop.put("remurlsVal", Math.min(sb.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT), 500));
|
||||
|
||||
return prop;
|
||||
}
|
||||
|
||||
private static void putFetched(serverObjects prop) {
|
||||
Iterator it = fetchMap.keySet().iterator();
|
||||
int count = 0;
|
||||
while (it.hasNext()) {
|
||||
String key = (String)it.next();
|
||||
prop.put("peers_" + count + "_peer", key);
|
||||
prop.put("peers_" + count + "_amount", ((Integer)fetchMap.get(key)).intValue());
|
||||
count++;
|
||||
}
|
||||
prop.put("peers", count);
|
||||
}
|
||||
|
||||
private static int addURLs(String[] urls, URLFetcherStack stack) {
|
||||
int count = -1;
|
||||
for (int i=0; i<urls.length; i++) try {
|
||||
if (urls[i].length() == 0) continue;
|
||||
stack.push(new URL(urls[i]));
|
||||
count++;
|
||||
} catch (MalformedURLException e) { /* ignore this */ }
|
||||
return count;
|
||||
}
|
||||
|
||||
private static void shiftFromNotice(plasmaCrawlNURL nurl, int fromStackType, URLFetcherStack stack, int count) throws IOException {
|
||||
plasmaCrawlNURL.Entry entry;
|
||||
for (int i=0; i<count; i++) {
|
||||
entry = nurl.pop(fromStackType);
|
||||
stack.push(entry.url());
|
||||
}
|
||||
}
|
||||
|
||||
private static int addURLs(serverObjects post, int amount, URLFetcherStack stack) {
|
||||
int count = 0;
|
||||
String url;
|
||||
for (int i=0; i<amount; i++) {
|
||||
url = post.get("url" + count++, null);
|
||||
if (url == null || url.length() == 0) continue;
|
||||
try {
|
||||
stack.push(new URL(url));
|
||||
count++;
|
||||
} catch (MalformedURLException e) {
|
||||
serverLog.logInfo("URLFETCHER", "retrieved invalid url for adding to the stack: " + url);
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<div class="SubMenu">
|
||||
<h3>URL Fetcher Menu</h3>
|
||||
<ul class="SubMenu">
|
||||
<li><a href="/CrawlURLFetch_p.html" class="MenuItemLink lock">URL Fetcher</a></li>
|
||||
<li><a href="/CrawlURLFetchStack_p.html" class="MenuItemLink lock">URL Stack</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -0,0 +1,138 @@
|
||||
// URLFetcherStack.java
|
||||
// -------------------------------------
|
||||
// part of YACY
|
||||
//
|
||||
// (C) 2007 by Franz Brausse
|
||||
//
|
||||
// last change: $LastChangedDate: $ by $LastChangedBy: $
|
||||
//
|
||||
// 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.
|
||||
|
||||
package de.anomic.data;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
|
||||
import de.anomic.kelondro.kelondroBase64Order;
|
||||
import de.anomic.kelondro.kelondroException;
|
||||
import de.anomic.kelondro.kelondroRow;
|
||||
import de.anomic.kelondro.kelondroStack;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.server.logging.serverLog;
|
||||
|
||||
public class URLFetcherStack {
|
||||
|
||||
public static final String DBFILE = "urlRemote2.stack";
|
||||
|
||||
private static final kelondroRow rowdef = new kelondroRow(
|
||||
"String urlstring-256",
|
||||
kelondroBase64Order.enhancedCoder,
|
||||
0
|
||||
);
|
||||
private final kelondroStack db;
|
||||
private final serverLog log;
|
||||
|
||||
private int popped = 0;
|
||||
private int pushed = 0;
|
||||
|
||||
public URLFetcherStack(String path) throws IOException {
|
||||
this.db = new kelondroStack(
|
||||
new File(path + File.separator + DBFILE),
|
||||
rowdef);
|
||||
this.log = new serverLog("URLFETCHERSTACK");
|
||||
}
|
||||
|
||||
public int getPopped() { return this.popped; }
|
||||
public int getPushed() { return this.pushed; }
|
||||
public void clearStat() { this.popped = 0; this.pushed = 0; }
|
||||
|
||||
public void finalize() throws Throwable {
|
||||
this.db.close();
|
||||
}
|
||||
|
||||
public boolean push(URL url) {
|
||||
try {
|
||||
this.db.push(this.db.row().newEntry(
|
||||
new byte[][] { url.toNormalform().getBytes() }
|
||||
));
|
||||
this.pushed++;
|
||||
return true;
|
||||
} catch (IOException e) {
|
||||
this.log.logSevere("error storing entry", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public URL pop() {
|
||||
try {
|
||||
kelondroRow.Entry r = this.db.pop();
|
||||
if (r == null) return null;
|
||||
final String url = r.getColString(0, null);
|
||||
try {
|
||||
this.popped++;
|
||||
return new URL(url);
|
||||
} catch (MalformedURLException e) {
|
||||
this.log.logSevere("found invalid URL-entry: " + url);
|
||||
return null;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
this.log.logSevere("error retrieving entry", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public String[] top(int count) {
|
||||
try {
|
||||
final ArrayList ar = new ArrayList();
|
||||
Iterator it = db.contentRows(500);
|
||||
kelondroRow.EntryIndex ei;
|
||||
for (int i=0; i<count && it.hasNext(); i++) {
|
||||
ei = (kelondroRow.EntryIndex)it.next();
|
||||
if (ei == null) continue;
|
||||
ar.add(ei.getColString(0, null));
|
||||
}
|
||||
return (String[])ar.toArray(new String[ar.size()]);
|
||||
} catch (kelondroException e) {
|
||||
this.log.logSevere("error retrieving entry", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public int size() {
|
||||
return this.db.size();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue