shortened network overview (less columns fit easier on page)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1124 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/Network.html

@@ -42,22 +42,22 @@
 <td class="small"><b>Name</b><br>&nbsp;</td>
 <td class="small"><b>Info</b><br>&nbsp;</td>
 <td class="small"><b>Release/<br>SVN</b><br>&nbsp;</td>
+<td class="small"><b>PPM</b><br>&nbsp;</td>
 <td class="small"><b>Last<br>Seen</b><br>&nbsp;&nbsp;<a href="/Network.html?page=#[page]#&sort=LastSeen&order=down">&lt;</a>&nbsp;<a href="/Network.html?page=#[page]#&sort=LastSeen&order=up">&gt;</a></td>
 <td class="small"><b>UTC</b><br>Offset<br>&nbsp;</td>
 <td class="small"><b>Uptime</b><br>&nbsp;&nbsp;<a href="/Network.html?page=#[page]#&sort=Uptime&order=up">&lt;</a>&nbsp;<a href="/Network.html?page=#[page]#&sort=Uptime&order=down">&gt;</a></td>
 <td class="small"><b>#Links</b><br>&nbsp;&nbsp;<a href="/Network.html?page=#[page]#&sort=LCount&order=up">&lt;</a>&nbsp;<a href="/Network.html?page=#[page]#&sort=LCount&order=down">&gt;</a></td>
 <td class="small"><b>#RWIs</b><br>&nbsp;&nbsp;<a href="/Network.html?page=#[page]#&sort=ICount&order=up">&lt;</a>&nbsp;<a href="/Network.html?page=#[page]#&sort=ICount&order=down">&gt;</a></td>
-<td class="small"><b>#CR-<br>Files</b><br>Own/Other</td>
 <td class="small"><b>Sent<br>Words</b><br>&nbsp;</td>
 <td class="small"><b>Sent<br>URLs</b><br>&nbsp;</td>
 <td class="small"><b>Received<br>Words</b><br>&nbsp;</td>
 <td class="small"><b>Received<br>URLs</b><br>&nbsp;</td>
-<td class="small"><b>PPM</b><br>&nbsp;</td>
-<td class="small"><b>#Seeds</b><br>&nbsp;</td>
 #(complete)#::
 <td class="small"><b>Address</b><br>&nbsp;</td>
 <td class="small"><b>Hash</b><br>&nbsp;</td>
+<td class="small"><b>#CR-<br>Files</b><br>Own/Other</td>
 <td class="small"><b>Age</b><br>&nbsp;</td>
+<td class="small"><b>#Seeds</b><br>&nbsp;</td>
 <td class="small"><b>con/h<br></b><br>&nbsp;</td>
 #(/complete)#
 </tr>
@@ -71,23 +71,23 @@
 <td class="small">
 #(type)##(direct)#<img border="0" src="/env/grafics/JuniorPassive.gif" title="Type: Junior | Contact: passive"></img>::<img border="0" src="/env/grafics/JuniorDirect.gif" title="Type: Junior | Contact: direct"></img>::<img border="0" src="/env/grafics/JuniorOffline.gif" title="Type: Junior | Contact: offline"></img>#(/direct)#::#(direct)#<img border="0" src="/env/grafics/SeniorPassive.gif" title="Type: Senior | Contact: passive"></img>::<img border="0" src="/env/grafics/SeniorDirect.gif" title="Type: Senior | Contact: direct"></img>::<img border="0" src="/env/grafics/SeniorOffline.gif" title="Type: Senior | Contact: offline"></img>#(/direct)#::<a href="#[url]#">#(direct)#<img border="0" src="/env/grafics/PrincipalPassive.gif" title="Type: Principal | Contact: passive | Seed download: possible"></img>::<img border="0" src="/env/grafics/PrincipalDirect.gif"  title="Type: Principal | Contact: direct | Seed download: possible"></img>::<img border="0" src="/env/grafics/PrincipalOffline.gif"  title="Type: Principal | Contact: offline | Seed download: ?"></img>#(/direct)#</a>#(/type)##(acceptcrawl)#<img border="0" src="/env/grafics/CrawlNo.gif" title="Accept Crawl: no"></img>::<img border="0" src="/env/grafics/CrawlYes.gif" title="Accept Crawl: yes"></img>::<img border="0" src="/env/grafics/CrawlYesOffline.gif" title="Accept Crawl: yes"></img>#(/acceptcrawl)##(dhtreceive)#<img border="0" src="/env/grafics/DHTReceiveNo.gif" title="DHT Receive: no"></img>::<img border="0" src="/env/grafics/DHTReceiveYes.gif" title="DHT Receive: yes"></img>::<img border="0" src="/env/grafics/DHTReceiveYesOffline.gif" title="DHT Receive: yes"></img>#(/dhtreceive)##(rankingreceive)#<img border="0" src="/env/grafics/RankingReceiveNo.gif" title="Ranking Receive: no"></img>::<img border="0" src="/env/grafics/RankingReceiveYes.gif" title="Ranking Receive: yes"></img>::<img border="0" src="/env/grafics/RankingCollects.gif" title="Ranking Receive: collection"></img>#(/rankingreceive)#</td>
 <td class="small" align="right">#[version]#</td>
+<td class="small" align="right">#[ppm]#</td>
 <td class="small" align="right">#[lastSeen]#</td>
 <td class="small" align="right">#[utc]#</td>
 <td class="small" align="right"><NOBR>#[uptime]#</NOBR></td>
 <td class="small" align="right">#[links]#</td>
 <td class="small" align="right">#[words]#</td>
-<td class="small" align="center">#[CRWCnt]#/#[CRTCnt]#</td>
 <td class="small" align="right">#[sI]#</td>
 <td class="small" align="right">#[sU]#</td>
 <td class="small" align="right">#[rI]#</td>
 <td class="small" align="right">#[rU]#</td>
-<td class="small" align="right">#[ppm]#</td>
-<td class="small" align="right">#[seeds]#</td>
 #(complete)#
 ::
 <td class="small"><a href="http://#[ip]#:#[port]#/Network.html?page=1&ip=" class="small">http://#[ip]#:#[port]#</a></td>
 <td class=small>#[hash]#</td>
+<td class="small" align="center">#[CRWCnt]#/#[CRTCnt]#</td>
 <td class=small>#[age]#</td>
+<td class="small" align="right">#[seeds]#</td>
 <td class="small" align="right">#[connects]#</td>
 #(/complete)#
 </tr>

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

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;
             }

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");
+        File YBRPath = new File(rootPath, "ranking/YBR");
-        if (rankingPath.exists()) {
+        if (YBRPath.exists()) {
-            plasmaSearchPreOrder.loadYBR(rankingPath, 15);
+            plasmaSearchPreOrder.loadYBR(YBRPath, 15);
         }
 
         // read memory amount