From 6e7d113eac0d581b8527e72b1b3d5abc629d9b8e Mon Sep 17 00:00:00 2001 From: orbiter Date: Tue, 23 Sep 2008 23:30:25 +0000 Subject: [PATCH] fix for wrong index initialization after network switch git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5203 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- build.properties | 2 +- htroot/Banner.java | 3 ++- htroot/ConfigBasic.java | 4 ++-- htroot/ConfigNetwork_p.java | 2 +- htroot/CrawlStart_p.java | 2 +- htroot/Network.java | 3 ++- htroot/NetworkPicture.java | 3 ++- htroot/Status.java | 4 ++-- htroot/yacysearch.java | 5 +++-- source/de/anomic/plasma/plasmaGrafics.java | 2 +- source/de/anomic/plasma/plasmaSwitchboard.java | 12 +++++------- .../de/anomic/plasma/plasmaSwitchboardConstants.java | 5 +++++ source/de/anomic/plasma/plasmaWordIndex.java | 4 ++++ source/de/anomic/yacy/yacyClient.java | 3 ++- source/de/anomic/yacy/yacyNetwork.java | 7 ++++--- 15 files changed, 37 insertions(+), 24 deletions(-) diff --git a/build.properties b/build.properties index b1aba106b..1923fec21 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.5 javacTarget=1.5 # Release Configuration -releaseVersion=0.602 +releaseVersion=0.603 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz diff --git a/htroot/Banner.java b/htroot/Banner.java index b9c3d4254..d4d48646a 100644 --- a/htroot/Banner.java +++ b/htroot/Banner.java @@ -34,6 +34,7 @@ import javax.imageio.ImageIO; import de.anomic.http.httpRequestHeader; import de.anomic.plasma.plasmaGrafics; import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.yacy.yacySeed; @@ -65,7 +66,7 @@ public class Banner { int myppm = 0; double myqph = 0; String type = ""; - final String network = env.getConfig("network.unit.name", "unspecified").toUpperCase(); + final String network = env.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "unspecified").toUpperCase(); final int peers = sb.webIndex.seedDB.sizeConnected() + 1; // the '+ 1': the own peer is not included in sizeConnected() long nlinks = sb.webIndex.seedDB.countActiveURL(); long nwords = sb.webIndex.seedDB.countActiveRWI(); diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index ed2f6a49a..82b48209e 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -134,7 +134,7 @@ public class ConfigBasic { } // set a use case - String networkName = sb.getConfig("network.unit.name", ""); + String networkName = sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, ""); if (post != null && post.containsKey("usecase")) { if (post.get("usecase", "").equals("freeworld") && !networkName.equals("freeworld")) { // switch to freeworld network @@ -159,7 +159,7 @@ public class ConfigBasic { } } - networkName = sb.getConfig("network.unit.name", ""); + networkName = sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, ""); if (networkName.equals("freeworld")) { prop.put("setUseCase", 1); prop.put("setUseCase_freeworldChecked", 1); diff --git a/htroot/ConfigNetwork_p.java b/htroot/ConfigNetwork_p.java index 42e656b50..0e52c031f 100644 --- a/htroot/ConfigNetwork_p.java +++ b/htroot/ConfigNetwork_p.java @@ -204,7 +204,7 @@ public class ConfigNetwork_p { // set network configuration prop.putHTML("network.unit.definition", sb.getConfig("network.unit.definition", "")); - prop.putHTML("network.unit.name", sb.getConfig("network.unit.name", "")); + prop.putHTML("network.unit.name", sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "")); prop.putHTML("network.unit.description", sb.getConfig("network.unit.description", "")); prop.putHTML("network.unit.domain", sb.getConfig("network.unit.domain", "")); prop.putHTML("network.unit.dht", sb.getConfig("network.unit.dht", "")); diff --git a/htroot/CrawlStart_p.java b/htroot/CrawlStart_p.java index f789b154a..222e30560 100644 --- a/htroot/CrawlStart_p.java +++ b/htroot/CrawlStart_p.java @@ -39,7 +39,7 @@ public class CrawlStart_p { // define visible variables String a = sb.webIndex.seedDB.mySeed().getPublicAddress(); - prop.put("starturl", (sb.getConfig("network.unit.name", "").equals("intranet")) ? "http://" + ((a == null) ? "localhost:" + sb.getConfig("port", "8080") : a) + "/repository/" : "http://"); + prop.put("starturl", (sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "").equals("intranet")) ? "http://" + ((a == null) ? "localhost:" + sb.getConfig("port", "8080") : a) + "/repository/" : "http://"); prop.put("proxyPrefetchDepth", env.getConfig("proxyPrefetchDepth", "0")); prop.put("crawlingDepth", env.getConfig("crawlingDepth", "0")); prop.put("crawlingFilter", env.getConfig("crawlingFilter", "0")); diff --git a/htroot/Network.java b/htroot/Network.java index 08f4d8b37..9b7514b51 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -39,6 +39,7 @@ import de.anomic.crawler.HTTPLoader; import de.anomic.http.HttpClient; import de.anomic.http.httpRequestHeader; import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverCodings; import de.anomic.server.serverDate; import de.anomic.server.serverObjects; @@ -61,7 +62,7 @@ public class Network { final serverObjects prop = new serverObjects(); prop.setLocalized(!(requestHeader.get("PATH")).endsWith(".xml")); prop.putHTML("page_networkTitle", sb.getConfig("network.unit.description", "unspecified")); - prop.putHTML("page_networkName", sb.getConfig("network.unit.name", "unspecified")); + prop.putHTML("page_networkName", sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "unspecified")); final boolean overview = (post == null) || (post.get("page", "0").equals("0")); final String mySeedType = sb.webIndex.seedDB.mySeed().get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN); diff --git a/htroot/NetworkPicture.java b/htroot/NetworkPicture.java index 02efa3c6a..59f51d09a 100644 --- a/htroot/NetworkPicture.java +++ b/htroot/NetworkPicture.java @@ -27,6 +27,7 @@ import de.anomic.http.httpRequestHeader; import de.anomic.plasma.plasmaGrafics; import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.ymage.ymageMatrix; @@ -63,7 +64,7 @@ public class NetworkPicture { if (passiveLimit > 1000000) passiveLimit = 1000000; if (potentialLimit > 1000000) potentialLimit = 1000000; if (maxCount > 1000) maxCount = 1000; - return plasmaGrafics.getNetworkPicture(sb.webIndex.seedDB, 10000, width, height, passiveLimit, potentialLimit, maxCount, corona, env.getConfig("network.unit.name", "unspecified"), env.getConfig("network.unit.description", "unspecified"), bgcolor); + return plasmaGrafics.getNetworkPicture(sb.webIndex.seedDB, 10000, width, height, passiveLimit, potentialLimit, maxCount, corona, env.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "unspecified"), env.getConfig("network.unit.description", "unspecified"), bgcolor); } } diff --git a/htroot/Status.java b/htroot/Status.java index 17db7e0ca..23c555470 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -205,10 +205,10 @@ public class Status { } } final String peerStatus = ((sb.webIndex.seedDB.mySeed() == null) ? yacySeed.PEERTYPE_VIRGIN : sb.webIndex.seedDB.mySeed().get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN)); - if (peerStatus.equals(yacySeed.PEERTYPE_VIRGIN) && sb.getConfig("network.unit.name", "").equals("freeworld")) { + if (peerStatus.equals(yacySeed.PEERTYPE_VIRGIN) && sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "").equals("freeworld")) { prop.put(PEERSTATUS, "0"); prop.put("urgentStatusVirgin", "1"); - } else if (peerStatus.equals(yacySeed.PEERTYPE_JUNIOR) && sb.getConfig("network.unit.name", "").equals("freeworld")) { + } else if (peerStatus.equals(yacySeed.PEERTYPE_JUNIOR) && sb.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "").equals("freeworld")) { prop.put(PEERSTATUS, "1"); prop.put("warningStatusJunior", "1"); } else if (peerStatus.equals(yacySeed.PEERTYPE_SENIOR)) { diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 85b17ab1a..18fab54ef 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -139,9 +139,10 @@ public class yacysearch { } // SEARCH - //final boolean indexDistributeGranted = sb.getConfig(plasmaSwitchboard.INDEX_DIST_ALLOW, "true").equals("true"); - //final boolean indexReceiveGranted = sb.getConfig("allowReceiveIndex", "true").equals("true"); + final boolean indexReceiveGranted = sb.getConfigBool(plasmaSwitchboardConstants.INDEX_RECEIVE_ALLOW, true); + global = global && indexReceiveGranted; // if the user does not want indexes from remote peers, it cannot be a global search //final boolean offline = yacyCore.seedDB.mySeed().isVirgin(); + final boolean clustersearch = sb.isRobinsonMode() && (sb.getConfig("cluster.mode", "").equals("privatecluster") || sb.getConfig("cluster.mode", "").equals("publiccluster")); diff --git a/source/de/anomic/plasma/plasmaGrafics.java b/source/de/anomic/plasma/plasmaGrafics.java index 434e110b8..7c05e60c1 100644 --- a/source/de/anomic/plasma/plasmaGrafics.java +++ b/source/de/anomic/plasma/plasmaGrafics.java @@ -114,7 +114,7 @@ public class plasmaGrafics { if (primarySearches == null) return null; // this was a local search and there are no threads // get a copy of a recent network picture - final ymageMatrix eventPicture = getNetworkPicture(seedDB, 120000, plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", "unspecified"), plasmaSwitchboard.getSwitchboard().getConfig("network.unit.description", "unspecified"), COL_BACKGROUND); + final ymageMatrix eventPicture = getNetworkPicture(seedDB, 120000, plasmaSwitchboard.getSwitchboard().getConfig(plasmaSwitchboardConstants.NETWORK_NAME, "unspecified"), plasmaSwitchboard.getSwitchboard().getConfig("network.unit.description", "unspecified"), COL_BACKGROUND); //if (eventPicture instanceof ymageMatrix) eventPicture = (ymageMatrix) eventPicture; //new ymageMatrix((ymageMatrix) eventPicture); // TODO: fix cloning of ymageMatrix pictures diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index fc1fb6eba..2828f4eb3 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -300,9 +300,12 @@ public final class plasmaSwitchboard extends serverAbstractSwitch result = nxTools.table(content, "UTF-8"); System.out.println("Result=" + result.toString()); diff --git a/source/de/anomic/yacy/yacyNetwork.java b/source/de/anomic/yacy/yacyNetwork.java index 7d366a91d..1023b105c 100644 --- a/source/de/anomic/yacy/yacyNetwork.java +++ b/source/de/anomic/yacy/yacyNetwork.java @@ -35,6 +35,7 @@ import org.apache.commons.httpclient.methods.multipart.Part; import de.anomic.http.DefaultCharsetStringPart; import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverCodings; import de.anomic.server.serverDate; import de.anomic.server.serverObjects; @@ -46,8 +47,8 @@ public class yacyNetwork { if ((post == null) || (env == null)) return false; // identify network - final String unitName = post.get("network.unit.name", yacySeed.DFLT_NETWORK_UNIT); // the network unit - if (!unitName.equals(env.getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT))) { + final String unitName = post.get(plasmaSwitchboardConstants.NETWORK_NAME, yacySeed.DFLT_NETWORK_UNIT); // the network unit + if (!unitName.equals(env.getConfig(plasmaSwitchboardConstants.NETWORK_NAME, yacySeed.DFLT_NETWORK_UNIT))) { return false; } @@ -86,7 +87,7 @@ public class yacyNetwork { post.add(new DefaultCharsetStringPart("myUTC", Long.toString(System.currentTimeMillis()))); // network identification - post.add(new DefaultCharsetStringPart("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT))); + post.add(new DefaultCharsetStringPart(plasmaSwitchboardConstants.NETWORK_NAME, plasmaSwitchboard.getSwitchboard().getConfig(plasmaSwitchboardConstants.NETWORK_NAME, yacySeed.DFLT_NETWORK_UNIT))); // authentification essentials final String authentificationControl = sb.getConfig("network.unit.protocol.control", "uncontrolled");