perfsonar development work

Author: nemanja.zutic
Date: 2008-11-25 04:04:48 -0500 (Tue, 25 Nov 2008)
New Revision: 4701

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
Log:
BWCTL results also displayed in Mbps

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java  
2008-11-21 15:38:04 UTC (rev 4700)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java  
2008-11-25 09:04:48 UTC (rev 4701)
@@ -254,17 +254,34 @@
                                String time = interval.split("-")[1];
                                if(startTime.equals("")) startTime = time;
                                String value = datum.getAttribute("value");   
  
-                               output = output +
-                                       "Interval: " +
-                                       datum.getAttribute("duration") +
-                                       " Transferred: " +
-                                       datum.getAttribute("numBytes") + " " +
-                                       datum.getAttribute("numBytesUnits") +
-                                       " / " +
-                                       datum.getAttribute("value") +
-                                       " " +
-                                       datum.getAttribute("valueUnits") +
-                                       "\n";
+//                             output = output +
+//                                     "Interval: " +
+//                                     datum.getAttribute("duration") +
+//                                     " Transferred: " +
+//                                     datum.getAttribute("numBytes") + " " +
+//                                     datum.getAttribute("numBytesUnits") +
+//                                     " / " +
+//                                     datum.getAttribute("value") +
+//                                     " " +
+//                                     datum.getAttribute("valueUnits") +
+//                                     "\n";
+                               output = output + "Interval: 
"+datum.getAttribute("duration")+" Transferred: ";
+                               String units1 = 
datum.getAttribute("numBytesUnits");
+                               String value1 = 
datum.getAttribute("numBytes");
+                               Long transferred = Long.parseLong(value1);
+                               if(units1.equals("Bytes")){
+                                       transferred/=(1024*1024);
+                                       output = output+transferred+" MB ";
+                               }
+                               output = output+"("+value1+" "+units1+") / ";
+                               String units2 = 
datum.getAttribute("valueUnits");
+                               String value2 = datum.getAttribute("value");
+                               Long througput = Long.parseLong(value2);
+                               if(units2.equals("bits/sec")){
+                                       througput/=(1000*1000);
+                                       output = output+througput+" Mbps ";
+                               }
+                               output = output+"("+value2+" "+units2+")\n";
                                
if(!(interval.startsWith("0.0")&&Double.parseDouble(time)>=duration)){
                                        
mainComponent.addValueToGraph(Double.parseDouble(time), 
Double.parseDouble(value)/(1000*1000));
                                }