changed 2, added 5 new picture for more information

added runtime to the list

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

htroot/Network.html

@@ -67,7 +67,8 @@
                   <a href="http://#[fullname]#.yacy/Wiki.html#[updatedWikiPage]#" class="small" title="Read and edit wiki on peer #[fullname]#">w</a>&nbsp;&nbsp;#[alert]#
 </td>
 <td class="small"><a href="http://www.#[fullname]#.yacy" class="small">#[shortname]#</a></td>
-<td class="small">#(info)##(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>#(/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>#(/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>#(/direct)#</a>#(/info)##(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>#(/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>#(/dhtreceive)#</td>
+<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)#</td>
 <td class="small" align="right">#[version]#</td>
 <td class="small" align="right">#[lastSeen]#</td>
 <td class="small" align="right">#[utc]#</td>
@@ -89,6 +90,7 @@
 #(/complete)#
 </tr>
 #{/list}#
+<tr><td colspan="15" align="right"><p><font size="-3"><i>runtime: #[rt]# ms</i></font></p></td></tr>
 </table>
 </p>
 ::
@@ -204,5 +206,6 @@ To do this, press this button:
 </form>
 #(/table)#
 #[footer]#
+
 </body>
 </html>

htroot/Network.java

@@ -65,6 +65,8 @@ public class Network {
     private static final String STR_TABLE_LIST = "table_list_";
 
     public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+        long start = System.currentTimeMillis();
+        
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
         final boolean overview = (post == null) || (((String) post.get("page", "0")).equals("0"));
@@ -309,24 +311,39 @@ public class Network {
 
 
                             if (seed.isJunior()) {
-                                prop.put(STR_TABLE_LIST + conCount + "_info", 0);
+                                prop.put(STR_TABLE_LIST + conCount + "_type", 0);
                             } else if(seed.isSenior()){
-                                prop.put(STR_TABLE_LIST + conCount + "_info", 1);
+                                prop.put(STR_TABLE_LIST + conCount + "_type", 1);
                             } else if(seed.isPrincipal()) {
-                                prop.put(STR_TABLE_LIST + conCount + "_info", 2);
+                                prop.put(STR_TABLE_LIST + conCount + "_type", 2);
                             }
-                            prop.put(STR_TABLE_LIST + conCount + "_info_url", seed.get("seedURL", "http://nowhere/"));
+                            prop.put(STR_TABLE_LIST + conCount + "_type_url", seed.get("seedURL", "http://nowhere/"));
 
                             long lastseen = Math.abs((System.currentTimeMillis() - seed.getLastSeenTime()) / 1000 / 60);
-//                          if (lastseen < 0) lastseen = 0;
-                            if (page == 2 || lastseen > 1440) { // Passive Peers should be passive, also Peers without contact greater than an day 
-                                prop.put(STR_TABLE_LIST + conCount + "_info_direct", 0);
-                            } else { 
-                                prop.put(STR_TABLE_LIST + conCount + "_info_direct", seed.getFlagDirectConnect() ? 1 : 0);
+                            if (page == 2 || lastseen > 1440) { // Passive Peers should be passive, also Peers without contact greater than an day
+                                // principal/senior/junior: red/red=offline
+                                prop.put(STR_TABLE_LIST + conCount + "_type_direct", 2);
+                            } else {
+                                // principal/senior: green/green=direct or yellow/yellow=passive
+                                // junior: red/green=direct or red/yellow=passive
+                                prop.put(STR_TABLE_LIST + conCount + "_type_direct", seed.getFlagDirectConnect() ? 1 : 0);
+                            }
+                            
+                            if (page == 1) {
+                                prop.put(STR_TABLE_LIST + conCount + "_acceptcrawl", seed.getFlagAcceptRemoteCrawl() ? 1 : 0); // green=on or red=off 
+                                prop.put(STR_TABLE_LIST + conCount + "_dhtreceive", seed.getFlagAcceptRemoteIndex() ? 1 : 0);  // green=on or red=off
+                            } else { // Passive, Potential Peers
+                                if (seed.getFlagAcceptRemoteCrawl()) {
+                                    prop.put(STR_TABLE_LIST + conCount + "_acceptcrawl", 2); // red/green: offline, was on
+                                } else {
+                                    prop.put(STR_TABLE_LIST + conCount + "_acceptcrawl", 0); // red/red; offline was off
+                                }
+                                if (seed.getFlagAcceptRemoteIndex()) {
+                                    prop.put(STR_TABLE_LIST + conCount + "_dhtreceive", 2);  // red/green: offline, was on
+                                } else {
+                                    prop.put(STR_TABLE_LIST + conCount + "_dhtreceive", 0);  // red/red; offline was off
+                                }
                             }
-                            prop.put(STR_TABLE_LIST + conCount + "_acceptcrawl", seed.getFlagAcceptRemoteCrawl() ? 1 : 0);
-                            prop.put(STR_TABLE_LIST + conCount + "_dhtreceive", seed.getFlagAcceptRemoteIndex() ? 1 : 0);
-
                             prop.put(STR_TABLE_LIST + conCount + "_version", yacy.combinedVersionString2PrettyString(seed.get("Version", "0.1")));
                             prop.put(STR_TABLE_LIST + conCount + "_lastSeen", lastseen);
                             prop.put(STR_TABLE_LIST + conCount + "_utc", seed.get("UTC", "-"));
@@ -359,6 +376,7 @@ public class Network {
                 default: break;
             }
         }
+        prop.put("table_rt", System.currentTimeMillis() - start);
         // return rewrite properties
         return prop;
     }