perfsonar development work

Author: nina
Date: 2007-10-28 09:27:30 -0400 (Sun, 28 Oct 2007)
New Revision: 3004

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
Log:
Fix for Bug241 ( https://bugzilla.perfsonar.net/show_bug.cgi?id=241 ) problem 
1 qnd problem 2
Problem 1:

When you click on any interface for which has some utilization data then UI
shows graph perfectly (as shown in UI-1.png)but after this if you click on any
interface for which utilization data is 'N/A' the graph from the previous
interface still remains there (as shown in UI-2.png). It doesn't get wiped of.

Problem 2:

When you click on any interface for which has some utilization data then UI
shows graph perfectly for last 90 minutes but when you click on other interval
buttons like 'Last Week' or 'Last Month' graph remains same (as shown in
UI-3.png).


Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2007-10-28 10:05:08 UTC (rev 3003)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2007-10-28 13:27:30 UTC (rev 3004)
@@ -271,7 +271,11 @@
        }
        public ArrayList<String> getEventTypes() {
                return qr.getEventTypes();
-       }       
+       }
+    public void clearQuery() {
+        qr.clearQuery();
+        
+    }  
 }
 
 class QueryResponse implements Cloneable {
@@ -294,6 +298,10 @@
                query_response[1].clear();
                eventTypes.clear();
        }
+    public void clearQuery() {
+        query_response[0].clear();
+    }
+    
        public void putQuery(Object key,Object value) {
                query_response[0].put(key,value);
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-10-28 10:05:08 UTC (rev 3003)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-10-28 13:27:30 UTC (rev 3004)
@@ -22,12 +22,12 @@
 
 import org.jdom.Namespace;
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.PSException;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.UnsupportedTypeException;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
 import org.perfsonar.perfsonarui.plugins.PSCountsDatum;
-import org.perfsonar.perfsonarui.plugins.PSErrorsDatum;
 import org.perfsonar.perfsonarui.plugins.PSTime;
 import org.perfsonar.perfsonarui.plugins.PSUtilizationDatum;
 import org.w3c.dom.Element;
@@ -81,46 +81,55 @@
   
     protected void processMetadata(Node metadata, UserData userData) {
         if (isInterrupted()) return;
+        /*
         String starttime =  
userData.getQuery(UserData.names[UserData.INDEX_STARTTIME]);
         String endtime =  
userData.getQuery(UserData.names[UserData.INDEX_ENDTIME]);
-        userData.clear(); //need to clear properties, but not 
timeinterval... TODO do it in a better way
+        */
+        userData.clearResponse(); //need to clear properties, but not 
timeinterval... TODO do it in a better way
+        /*
         
userData.setQuery(UserData.names[UserData.INDEX_STARTTIME],starttime);
         userData.setQuery(UserData.names[UserData.INDEX_ENDTIME],endtime);
+        */
 
         //System.out.println("Process 
metadata\t"+((Element)metadata).getAttribute("id"));
         NodeList subject = 
((Element)metadata).getElementsByTagNameNS(URI_perfsonar[perfsonar_version][1],
 "subject");
-        if (subject.getLength() == 0) return;
-        for (int m=0; m<subject.getLength(); m++) 
-            if (subject.item(m) instanceof Element) {
-                
-                NodeList nmwgt_interface = 
((Element)subject.item(m)).getElementsByTagNameNS(URI_nmwgt[nmwg_version], 
"interface");
-                
-                for (int i=0; i < nmwgt_interface.getLength();i++) {
-                     NodeList ifc = nmwgt_interface.item(i).getChildNodes();
-                          
-                     for (int j=0; j < ifc.getLength();j++) {
-                         Node node = ifc.item(j);
-                         //System.out.println(node.getNodeValue());
-                         if ((node != null) && (node instanceof 
org.w3c.dom.Element)) {
-                             Node child = node.getFirstChild();
-                             if (child != null) {
-                                 
userData.setResponse(node.getLocalName(),child.getNodeValue());
-                                 
//System.out.println(node.getLocalName()+'\t'+child.getNodeValue());
-                             }
-                         }    
-                     }
-                }           
-        }
-        userData.setDirection(userData.getResponse(UserData.C_DIRECTION));
+        if (subject.getLength() > 0) {
+            for (int m=0; m<subject.getLength(); m++) 
+                if (subject.item(m) instanceof Element) {
+                    
+                    NodeList nmwgt_interface = 
((Element)subject.item(m)).getElementsByTagNameNS(URI_nmwgt[nmwg_version], 
"interface");
+                    
+                    for (int i=0; i < nmwgt_interface.getLength();i++) {
+                         NodeList ifc = 
nmwgt_interface.item(i).getChildNodes();
+                              
+                         for (int j=0; j < ifc.getLength();j++) {
+                             Node node = ifc.item(j);
+                             //System.out.println(node.getNodeValue());
+                             if ((node != null) && (node instanceof 
org.w3c.dom.Element)) {
+                                 Node child = node.getFirstChild();
+                                 if (child != null) {
+                                     
userData.setResponse(node.getLocalName(),child.getNodeValue());
+                                     
//System.out.println(node.getLocalName()+'\t'+child.getNodeValue());
+                                 }
+                             }    
+                         }
+                    }           
+            }
+            
userData.setDirection(userData.getResponse(UserData.C_DIRECTION));
+        }            
         
         Node eventType = 
((org.w3c.dom.Element)metadata).getElementsByTagNameNS(URI_nmwg[nmwg_version],"eventType").item(0);
         if (eventType != null) {
             String event = eventType.getFirstChild().getNodeValue();
-            if (userData.isInput())
-                userData.getEndpoint().setEvent(event,0);
-            else if (userData.isOutput())
-                userData.getEndpoint().setEvent(event,1);
-            else userData.getEndpoint().setEvent(event,-1); //both
+            if (event.startsWith("error."))
+                fireAxisCallException(userData, new 
PSException(userData,event));
+            else {    
+                if (userData.isInput())
+                    userData.getEndpoint().setEvent(event,0);
+                else if (userData.isOutput())
+                    userData.getEndpoint().setEvent(event,1);
+                else userData.getEndpoint().setEvent(event,-1); //both
+            }
         }
     }
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java 
  2007-10-28 10:05:08 UTC (rev 3003)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java 
  2007-10-28 13:27:30 UTC (rev 3004)
@@ -43,6 +43,16 @@
         *
         */
        public void clear();
+    /**
+     * Clears only query data
+     *
+     */
+    public void clearQuery();
+    /**
+     * Clears only response data
+     *
+     */
+    public void clearResponse();
        /**
         * 
         * @return endpoint 
{@link
 MAEndpoint}