[freenet-CVS] freenet/src/freenet/client/http NodeStatusServlet.java, 1.72, 1.73

[Matthew Toseland]

Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv9925/src/freenet/client/http

Modified Files:
        NodeStatusServlet.java 
Log Message:
improve nodestatus page with last estimate. make 6280 mandatory.


Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -w -r1.72 -r1.73
--- NodeStatusServlet.java      22 Oct 2003 22:07:14 -0000      1.72
+++ NodeStatusServlet.java      27 Oct 2003 15:06:06 -0000      1.73
@@ -1796,13 +1796,14 @@
        boolean failing = true;
        boolean isCPRT = rtType.equals("freenet.node.rt.CPAlgoRoutingTable");
        boolean isNGRT = rtType.equals("freenet.node.rt.NGRoutingTable");
+       int ngrtadd = isNGRT?1:0;
        NodeReference ref = null;
        if (isCPRT || isNGRT) {
-            if (refValues[2].equals(ZERO)) {
-                refValues[2] = "none";
+            if (refValues[2+ngrtadd].equals(ZERO)) {
+                refValues[2+ngrtadd] = "none";
                failing = false;
             }
-           int col = isCPRT ? 12 : 14;
+           int col = isCPRT ? 12 : 15;
            refValues[col] = refValues[col].toString() + "/" + 
                refValues[col+1];
            if(refValues[col].equals("0/0")) {
@@ -1811,15 +1812,15 @@
                refValues[col] = "<font color=\"green\">"+refValues[col]+
                    "</font>";
            }
-           long lastTry = ((Long)refValues[5]).longValue();
+           long lastTry = ((Long)refValues[5+ngrtadd]).longValue();
             if (lastTry <= 0 || lastTry >= (1000*1000*1000)) {
                if(lastTry > 0)
                    Core.logger.log(this, "lastTry has ridiculous value "+
                                    lastTry+" in formatRef", 
                                    new Exception("debug"), Logger.NORMAL);
-                refValues[5] = "never";
+                refValues[5+ngrtadd] = "never";
             } else {
-                refValues[5] = refValues[5].toString() + " secs. ago";
+                refValues[5+ngrtadd] = refValues[5+ngrtadd].toString() + " secs. ago";
             }
        }
         if (isCPRT) {
@@ -1877,9 +1878,10 @@
                refValues[9] = "<a href=\"/"+refValues[11]+"\">" + refValues[9] + 
"</a>";
            }
        } else if(isNGRT) {
-           ref = (NodeReference)refValues[9];
-           refValues[7] = refValues[7].toString() + "ms";
+           ref = (NodeReference)refValues[10];
+           refValues[1] = refValues[1].toString() + "ms";
            refValues[8] = refValues[8].toString() + "ms";
+           refValues[9] = refValues[9].toString() + "ms";
            refValues[0] = "<a href=\"nodeDetails.html?identity="+
                ((DSAIdentity)(ref.getIdentity())).getYAsHexString()+
                "\">"+refValues[0]+"</a>";

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs