perfsonar development work

Author: nina
Date: 2007-11-09 11:01:15 -0500 (Fri, 09 Nov 2007)
New Revision: 3029

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
Log:
fixed bug in processing echo response

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java     
  2007-11-09 13:58:08 UTC (rev 3028)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java     
  2007-11-09 16:01:15 UTC (rev 3029)
@@ -30,7 +30,7 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * Sends Echo Request.
@@ -148,13 +148,13 @@
                 Iterator<org.w3c.dom.Element> i = metadataChain.iterator();
                 while (i.hasNext()) {
                     org.w3c.dom.Element metadata = i.next();
-                    String result = getText(metadata);
+                    String result = getErrorCode(metadata);
                     if (result != null)
                         ((EchoResponse) listener).setStatus(result);
                 }                
 
                 if (data != null) {
-                    String result = getText(data);
+                    String result = getErrorDescription(data);
                     if (result != null)                 
                         ((EchoResponse) 
listener).setStatusExplanation(result);
                 }   
@@ -167,7 +167,8 @@
                logger.error(x);
            }
     }
-    
+
+    /*
     protected String getText(org.w3c.dom.Element node) {
        Node child = node.getFirstChild();
        if (child != null) {
@@ -178,7 +179,33 @@
        }  
        return null;
     }
+*/
+    protected String getErrorCode(org.w3c.dom.Element node) {
+       StringBuffer b = new StringBuffer();
+       NodeList eventTypes  = node.getElementsByTagNameNS(NMWG2,"eventType");
+       for (int i=0; i < eventTypes.getLength();i++) {
+               NodeList children = eventTypes.item(i).getChildNodes();
+               for (int j=0; j < children.getLength();j++) {
+                       String text = children.item(j).getNodeValue();
+                       if (text != null) b.append(text);
+               }
+       }
+       return b.toString();
+    }
+    protected String getErrorDescription(org.w3c.dom.Element node) {
 
+       StringBuffer b = new StringBuffer();
+       NodeList errorDescription  = 
node.getElementsByTagNameNS(URI_nmwgr,IUserData.C_DATUM);
+       for (int i=0; i < errorDescription.getLength();i++) {
+               NodeList children = errorDescription.item(i).getChildNodes();
+               for (int j=0; j < children.getLength();j++) {
+                       String text = children.item(j).getNodeValue();
+                       if (text != null) b.append(text);
+               }
+       }
+       return b.toString();            
+    }  
+    
 
        public String getEventType() {
                return eventType;