mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
0e1738899f
- put(key, value) methods are now used if a value added to the map should be kept as it is. Numbers are transformed (but not formatted) to an equivalent String representation.
- putASIS(...) have been removed, now done with simple put(...) (see above).
- puNum(...) can be used for number values which should be stored in a formatted way, either depending on the current locale setting for yacy (default) or in a "none" locale (see javadocs and setLocalize()).
- putHTML(...) escapes special characters into corresponding HTML enities ('<' => '<') which was done with put(...) before and so was called too often, becauses it is necessary only for very few cases. Additionally there is a "forXML" mode which only replaces < > & ".
In short: Use put(...) for almost everything, use putXY(...) if you need some special transformation of the value.
A few bugs have been fixed as well, and there should be a small performance improvement for complex pages with a lot of values.
* added additional Sum/Avg rows to access tracker pages, see http://forum.yacy-websuche.de/viewtopic.php?f=5&t=456
* removed duplicate code (mostly related to the big changes above).
TODO:
- make sure, number formats work as expected _everywhere_, report overseen stuff http://forum.yacy-websuche.de/viewtopic.php?f=5&t=437
- probably a good idea to add special putDate() methods as they are used in many pages and create duplicated formatting code + maybe some centralized handling for memory value formatting.
- further improve the speed of page creation for the WatchCrawler.
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4178 6c8d7289-2bf4-0310-a012-ef5d649a1542
210 lines
9.9 KiB
Java
210 lines
9.9 KiB
Java
// ConfigNetwork_p.java
|
|
// --------------------
|
|
// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
|
|
// first published 20.04.2007 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.httpHeader;
|
|
import de.anomic.plasma.plasmaSwitchboard;
|
|
import de.anomic.server.serverCodings;
|
|
import de.anomic.server.serverObjects;
|
|
import de.anomic.server.serverSwitch;
|
|
import de.anomic.server.serverThread;
|
|
import de.anomic.yacy.yacyCore;
|
|
|
|
public class ConfigNetwork_p {
|
|
|
|
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
|
|
|
plasmaSwitchboard sb = (plasmaSwitchboard) env;
|
|
serverObjects prop = new serverObjects();
|
|
int commit = 0;
|
|
|
|
if (post != null) {
|
|
|
|
boolean crawlResponse = post.get("crawlResponse", "off").equals("on");
|
|
|
|
// DHT control
|
|
boolean indexDistribute = post.get("indexDistribute", "").equals("on");
|
|
boolean indexReceive = post.get("indexReceive", "").equals("on");
|
|
boolean robinsonmode = post.get("network", "").equals("robinson");
|
|
String clustermode = post.get("cluster.mode", "publicpeer");
|
|
if (robinsonmode) {
|
|
indexDistribute = false;
|
|
indexReceive = false;
|
|
if ((clustermode.equals("privatepeer")) || (clustermode.equals("publicpeer"))) {
|
|
prop.put("commitRobinsonWithoutRemoteIndexing", "1");
|
|
crawlResponse = false;
|
|
}
|
|
if ((clustermode.equals("privatecluster")) || (clustermode.equals("publiccluster"))) {
|
|
prop.put("commitRobinsonWithRemoteIndexing", "1");
|
|
crawlResponse = true;
|
|
}
|
|
commit = 1;
|
|
} else {
|
|
if (!indexDistribute && !indexReceive) {
|
|
prop.put("commitDHTIsRobinson", "1");
|
|
commit = 2;
|
|
} else if (indexDistribute && indexReceive) {
|
|
commit = 1;
|
|
} else {
|
|
prop.put("commitDHTNoGlobalSearch", "1");
|
|
commit = 1;
|
|
}
|
|
if (!crawlResponse) {
|
|
prop.put("commitCrawlPlea", "1");
|
|
}
|
|
}
|
|
|
|
if (indexDistribute) {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW, "true");
|
|
} else {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW, "false");
|
|
}
|
|
|
|
if (post.get("indexDistributeWhileCrawling","").equals("on")) {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_CRAWLING, "true");
|
|
} else {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_CRAWLING, "false");
|
|
}
|
|
|
|
if (post.get("indexDistributeWhileIndexing","").equals("on")) {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_INDEXING, "true");
|
|
} else {
|
|
sb.setConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_INDEXING, "false");
|
|
}
|
|
|
|
if (indexReceive) {
|
|
sb.setConfig("allowReceiveIndex", "true");
|
|
yacyCore.seedDB.mySeed().setFlagAcceptRemoteIndex(true);
|
|
} else {
|
|
sb.setConfig("allowReceiveIndex", "false");
|
|
yacyCore.seedDB.mySeed().setFlagAcceptRemoteIndex(false);
|
|
}
|
|
|
|
if (post.get("indexReceiveBlockBlacklist", "").equals("on")) {
|
|
sb.setConfig("indexReceiveBlockBlacklist", "true");
|
|
} else {
|
|
sb.setConfig("indexReceiveBlockBlacklist", "false");
|
|
}
|
|
|
|
if (post.containsKey("peertags")) {
|
|
yacyCore.seedDB.mySeed().setPeerTags(serverCodings.string2set(normalizedList((String) post.get("peertags")), ","));
|
|
}
|
|
|
|
sb.setConfig("cluster.mode", post.get("cluster.mode", "publicpeer"));
|
|
|
|
// read remote crawl request settings
|
|
sb.setConfig("crawlResponse", (crawlResponse) ? "true" : "false");
|
|
int newppm = 1;
|
|
try {
|
|
newppm = Math.max(1, Integer.parseInt(post.get("acceptCrawlLimit", "1")));
|
|
} catch (NumberFormatException e) {}
|
|
long newBusySleep = Math.max(100, 60000 / newppm);
|
|
serverThread rct = sb.getThread(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL);
|
|
rct.setBusySleep(newBusySleep);
|
|
sb.setConfig(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, Long.toString(newBusySleep));
|
|
|
|
sb.setConfig("cluster.peers.ipport", checkIPPortList(post.get("cluster.peers.ipport", "")));
|
|
sb.setConfig("cluster.peers.yacydomain", checkYaCyDomainList(post.get("cluster.peers.yacydomain", "")));
|
|
|
|
// update the cluster hash set
|
|
sb.clusterhashes = yacyCore.seedDB.clusterHashes(sb.getConfig("cluster.peers.yacydomain", ""));
|
|
|
|
}
|
|
|
|
// write answer code
|
|
prop.put("commit", commit);
|
|
|
|
// write remote crawl request settings
|
|
prop.put("crawlResponse", sb.getConfigBool("crawlResponse", false) ? "1" : "0");
|
|
long RTCbusySleep = 100;
|
|
try {
|
|
RTCbusySleep = Integer.parseInt(env.getConfig(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, "100"));
|
|
} catch (NumberFormatException e) {}
|
|
int RTCppm = (int) (60000L / RTCbusySleep);
|
|
prop.put("acceptCrawlLimit", RTCppm);
|
|
|
|
boolean indexDistribute = sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW, "true").equals("true");
|
|
boolean indexReceive = sb.getConfig("allowReceiveIndex", "true").equals("true");
|
|
prop.put("indexDistributeChecked", (indexDistribute) ? "1" : "0");
|
|
prop.put("indexDistributeWhileCrawling.on", (sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_CRAWLING, "true").equals("true")) ? "1" : "0");
|
|
prop.put("indexDistributeWhileCrawling.off", (sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_CRAWLING, "true").equals("true")) ? "0" : "1");
|
|
prop.put("indexDistributeWhileIndexing.on", (sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_INDEXING, "true").equals("true")) ? "1" : "0");
|
|
prop.put("indexDistributeWhileIndexing.off", (sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW_WHILE_INDEXING, "true").equals("true")) ? "0" : "1");
|
|
prop.put("indexReceiveChecked", (indexReceive) ? "1" : "0");
|
|
prop.put("indexReceiveBlockBlacklistChecked.on", (sb.getConfig("indexReceiveBlockBlacklist", "true").equals("true")) ? "1" : "0");
|
|
prop.put("indexReceiveBlockBlacklistChecked.off", (sb.getConfig("indexReceiveBlockBlacklist", "true").equals("true")) ? "0" : "1");
|
|
prop.putHTML("peertags", serverCodings.set2string(yacyCore.seedDB.mySeed().getPeerTags(), ",", false));
|
|
|
|
// set seed information directly
|
|
yacyCore.seedDB.mySeed().setFlagAcceptRemoteCrawl(sb.getConfigBool("crawlResponse", false));
|
|
yacyCore.seedDB.mySeed().setFlagAcceptRemoteIndex(indexReceive);
|
|
|
|
// set p2p/robinson mode flags and values
|
|
prop.put("p2p.checked", (indexDistribute || indexReceive) ? "1" : "0");
|
|
prop.put("robinson.checked", (indexDistribute || indexReceive) ? "0" : "1");
|
|
prop.put("cluster.peers.ipport", sb.getConfig("cluster.peers.ipport", ""));
|
|
prop.put("cluster.peers.yacydomain", sb.getConfig("cluster.peers.yacydomain", ""));
|
|
prop.put("cluster.peers.yacydomain.hashes", (sb.clusterhashes.size() == 0) ? "" : sb.clusterhashes.toString());
|
|
// set p2p mode flags
|
|
prop.put("privatepeerChecked", (sb.getConfig("cluster.mode", "").equals("privatepeer")) ? "1" : "0");
|
|
prop.put("privateclusterChecked", (sb.getConfig("cluster.mode", "").equals("privatecluster")) ? "1" : "0");
|
|
prop.put("publicclusterChecked", (sb.getConfig("cluster.mode", "").equals("publiccluster")) ? "1" : "0");
|
|
prop.put("publicpeerChecked", (sb.getConfig("cluster.mode", "").equals("publicpeer")) ? "1" : "0");
|
|
|
|
return prop;
|
|
}
|
|
|
|
public static String normalizedList(String input) {
|
|
input = input.replace(' ', ',');
|
|
input = input.replace(' ', ';');
|
|
input = input.replaceAll(",,", ",");
|
|
if (input.startsWith(",")) input = input.substring(1);
|
|
if (input.endsWith(",")) input = input.substring(0, input.length() - 1);
|
|
return input;
|
|
}
|
|
|
|
public static String checkYaCyDomainList(String input) {
|
|
input = normalizedList(input);
|
|
String[] s = input.split(",");
|
|
input = "";
|
|
for (int i = 0; i < s.length; i++) {
|
|
if ((s[i].endsWith(".yacyh")) || (s[i].endsWith(".yacy")) ||
|
|
(s[i].indexOf(".yacyh=") > 0) || (s[i].indexOf(".yacy=") > 0)) input += "," + s[i];
|
|
}
|
|
if (input.length() == 0) return input; else return input.substring(1);
|
|
}
|
|
|
|
public static String checkIPPortList(String input) {
|
|
input = normalizedList(input);
|
|
String[] s = input.split(",");
|
|
input = "";
|
|
for (int i = 0; i < s.length; i++) {
|
|
if (s[i].indexOf(':') >= 9) input += "," + s[i];
|
|
}
|
|
if (input.length() == 0) return input; else return input.substring(1);
|
|
}
|
|
}
|