diff --git a/htroot/Network.html b/htroot/Network.html
index 648886537..775239bda 100644
--- a/htroot/Network.html
+++ b/htroot/Network.html
@@ -42,22 +42,22 @@
Name
|
Info
|
Release/
SVN
|
+PPM
|
Last
Seen
< > |
UTC
Offset
|
Uptime
< > |
#Links
< > |
#RWIs
< > |
-#CR-
Files
Own/Other |
Sent
Words
|
Sent
URLs
|
Received
Words
|
Received
URLs
|
-PPM
|
-#Seeds
|
#(complete)#::
Address
|
Hash
|
+#CR-
Files
Own/Other |
Age
|
+#Seeds
|
con/h
|
#(/complete)#
@@ -71,23 +71,23 @@
#(type)##(direct)# :: :: #(/direct)#::#(direct)# :: :: #(/direct)#::#(direct)# :: :: #(/direct)##(/type)##(acceptcrawl)# :: :: #(/acceptcrawl)##(dhtreceive)# :: :: #(/dhtreceive)##(rankingreceive)# :: :: #(/rankingreceive)# |
#[version]# |
+#[ppm]# |
#[lastSeen]# |
#[utc]# |
#[uptime]# |
#[links]# |
#[words]# |
-#[CRWCnt]#/#[CRTCnt]# |
#[sI]# |
#[sU]# |
#[rI]# |
#[rU]# |
-#[ppm]# |
-#[seeds]# |
#(complete)#
::
http://#[ip]#:#[port]# |
#[hash]# |
+#[CRWCnt]#/#[CRTCnt]# |
#[age]# |
+#[seeds]# |
#[connects]# |
#(/complete)#
diff --git a/htroot/Network.java b/htroot/Network.java
index 55072236d..ced6a32f3 100644
--- a/htroot/Network.java
+++ b/htroot/Network.java
@@ -311,6 +311,9 @@ public class Network {
prop.put(STR_TABLE_LIST + conCount + "_complete_port", seed.get(yacySeed.PORT, "-") );
prop.put(STR_TABLE_LIST + conCount + "_complete_hash", seed.hash);
prop.put(STR_TABLE_LIST + conCount + "_complete_age", seed.getAge());
+ prop.put(STR_TABLE_LIST + conCount + "_complete_CRWCnt", seed.get(yacySeed.CRWCNT, "0"));
+ prop.put(STR_TABLE_LIST + conCount + "_complete_CRTCnt", seed.get(yacySeed.CRTCNT, "0"));
+ prop.put(STR_TABLE_LIST + conCount + "_complete_seeds", seed.get(yacySeed.SCOUNT, "-"));
prop.put(STR_TABLE_LIST + conCount + "_complete_connects", groupDigits(seed.get(yacySeed.CCOUNT, "0")));
} else {
prop.put(STR_TABLE_LIST + conCount + "_complete", 0);
@@ -363,14 +366,11 @@ public class Network {
prop.put(STR_TABLE_LIST + conCount + "_uptime", serverDate.intervalToString(60000 * Long.parseLong(seed.get(yacySeed.UPTIME, "0"))));
prop.put(STR_TABLE_LIST + conCount + "_links", groupDigits(seed.get(yacySeed.LCOUNT, "0")));
prop.put(STR_TABLE_LIST + conCount + "_words", groupDigits(seed.get(yacySeed.ICOUNT, "0")));
- prop.put(STR_TABLE_LIST + conCount + "_CRWCnt", seed.get(yacySeed.CRWCNT, "0"));
- prop.put(STR_TABLE_LIST + conCount + "_CRTCnt", seed.get(yacySeed.CRTCNT, "0"));
prop.put(STR_TABLE_LIST + conCount + "_sI", groupDigits(seed.get(yacySeed.INDEX_OUT, "0")));
prop.put(STR_TABLE_LIST + conCount + "_sU", groupDigits(seed.get(yacySeed.URL_OUT, "0")));
prop.put(STR_TABLE_LIST + conCount + "_rI", groupDigits(seed.get(yacySeed.INDEX_IN, "0")));
prop.put(STR_TABLE_LIST + conCount + "_rU", groupDigits(seed.get(yacySeed.URL_IN, "0")));
prop.put(STR_TABLE_LIST + conCount + "_ppm", PPM);
- prop.put(STR_TABLE_LIST + conCount + "_seeds", seed.get(yacySeed.SCOUNT, "-"));
conCount++;
} // seed != null
} // while
diff --git a/source/de/anomic/plasma/plasmaSearchPreOrder.java b/source/de/anomic/plasma/plasmaSearchPreOrder.java
index 2a8ac3248..7ad3baab1 100644
--- a/source/de/anomic/plasma/plasmaSearchPreOrder.java
+++ b/source/de/anomic/plasma/plasmaSearchPreOrder.java
@@ -64,10 +64,16 @@ public final class plasmaSearchPreOrder {
if (rankingPath.exists()) {
ybrTables = new kelondroBinSearch[count];
String ybrName;
+ File f;
try {
for (int i = 0; i < count; i++) {
ybrName = "YBR-4-" + serverCodings.encodeHex(i, 2) + ".idx";
- ybrTables[i] = new kelondroBinSearch(serverFileUtils.read(new File(rankingPath, ybrName)), 6);
+ f = new File(rankingPath, ybrName);
+ if (f.exists()) {
+ ybrTables[i] = new kelondroBinSearch(serverFileUtils.read(f), 6);
+ } else {
+ ybrTables[i] = null;
+ }
}
} catch (IOException e) {
ybrTables = null;
@@ -144,7 +150,7 @@ public final class plasmaSearchPreOrder {
if (!(useYBR)) return 16;
final String domHash = urlHash.substring(6);
for (int i = 0; i < ybrTables.length; i++) {
- if (ybrTables[i].contains(domHash.getBytes())) {
+ if ((ybrTables[i] != null) && (ybrTables[i].contains(domHash.getBytes()))) {
//System.out.println("YBR FOUND: " + urlHash + " (" + i + ")");
return i;
}
diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java
index 60ba3b653..8ec000eaa 100644
--- a/source/de/anomic/plasma/plasmaSwitchboard.java
+++ b/source/de/anomic/plasma/plasmaSwitchboard.java
@@ -282,9 +282,9 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
}
// load ranking tables
- File rankingPath = new File(rootPath, "ranking/YBR");
- if (rankingPath.exists()) {
- plasmaSearchPreOrder.loadYBR(rankingPath, 15);
+ File YBRPath = new File(rootPath, "ranking/YBR");
+ if (YBRPath.exists()) {
+ plasmaSearchPreOrder.loadYBR(YBRPath, 15);
}
// read memory amount