perfsonar development work

Author: nina
Date: 2008-06-18 06:33:12 -0400 (Wed, 18 Jun 2008)
New Revision: 4018

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarResponse.java
Log:
ErrorResponse message processing

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2008-06-17 16:16:46 UTC (rev 4017)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2008-06-18 10:33:12 UTC (rev 4018)
@@ -25,7 +25,9 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
 import java.util.Observable;
 import java.util.TimeZone;
 
@@ -439,6 +441,67 @@
          return outWriter.toString();
 
     }  
+    
+    protected void processErrorCode(org.w3c.dom.Element data, 
ArrayList<org.w3c.dom.Element> metadataChain, IUserData userData) {
+
+        PSErrorCodeException exception = null;
+        
+        for (org.w3c.dom.Element metadata: metadataChain) {
+            Node eventType = 
metadata.getElementsByTagNameNS(NMWG2,"eventType").item(0);
+            if (eventType != null) {
+                String event = eventType.getFirstChild().getNodeValue();
+                if (event.startsWith("error.")) {
+                    if (exception == null) {
+                        MAEndpoint endpoint = null;
+                        if (userData != null) endpoint = 
userData.getEndpoint();
+                        exception = new 
PSErrorCodeException(endpoint,null,null);
+                    }
+                    exception.setErrorCode(event);
+                    logger.error(event);
+                    //fireAxisCallException(userData, x);
+                    
+                    NodeList datum  = 
data.getElementsByTagNameNS(URI_nmwgr,IUserData.C_DATUM);
+                    
+                    if ((datum!=null) && (datum.getLength()>0)) {
+                        for (int i=0; i < datum.getLength();i++) {
+                             org.w3c.dom.Element d = 
(org.w3c.dom.Element)datum.item(i);
+                             String description = d.getTextContent();
+                             if (exception == null) {
+                                 MAEndpoint endpoint = null;
+                                 if (userData != null) endpoint = 
userData.getEndpoint();
+                                 if (exception == null)
+                                     exception = new 
PSErrorCodeException(endpoint,null,null);
+                                 exception.setMaEndpoint(endpoint);
+                             }
+                             exception.setErrordescription(description);
+                             //logger.warn(">>\t" + userData.getId() + '\t'+ 
userData.getHostname(AbstractUserData.ID_RESPONSE) + '\t' + 
d.getTextContent());
+                        }
+                    }
+                    if (exception != null) {
+                        logger.error(event);
+                        fireAxisCallException(userData, exception);
+                    }
+                    if (userData != null)
+                        
userData.setResponse(AbstractUserData.C_STATUS,exception.getFullMessage());   
                           
+                } else {if (userData != null) 
userData.setResponse(AbstractUserData.C_STATUS,"OK");}    
+            } else {if (userData != null) 
userData.setResponse(AbstractUserData.C_STATUS,"OK");}
+        }
+        
+    }
+    
+    public void processErrorResponse(final IUserData uData, Document 
response, IPerfsonarResponse listener) throws Exception {
+       logger.debug(response);
+           NMWGHelper helper = new NMWGHelper() {
+               /* (non-Javadoc)
+             * @see 
org.perfsonar.perfsonarui.NMWGHelper#process(org.w3c.dom.Node, 
java.lang.String, org.w3c.dom.Node, java.lang.String)
+             */
+            @Override
+            public void process(org.w3c.dom.Element data, 
ArrayList<org.w3c.dom.Element> metadataChain) throws Exception {
+                processErrorCode(data,metadataChain,uData);
+            }
+           };          
+           helper.process(response);
+    }
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java  
2008-06-17 16:16:46 UTC (rev 4017)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java  
2008-06-18 10:33:12 UTC (rev 4018)
@@ -544,7 +544,9 @@
                    
                } else if 
(messageType.equals(IPerfsonarResponse.MA_MetadataKeyResponse)) 
                    processMetadataKeyRequest(response, 
(MetadataListResponseListener)listener,userData);
-               else throw new Exception("Unknown Message 
type!\t"+messageType);
+               else if 
(messageType.equals(IPerfsonarResponse.ErrorResponse)) {
+                       processErrorResponse(userData, response, listener);
+               } else throw new Exception("Unknown Message 
type!\t"+messageType);
                }
        }
        @Override
@@ -692,52 +694,7 @@
            }
        }
     
-    protected void processErrorCode(org.w3c.dom.Element data, 
ArrayList<org.w3c.dom.Element> metadataChain, IUserData userData) {
 
-        PSErrorCodeException exception = null;
-        
-        for (org.w3c.dom.Element metadata: metadataChain) {
-            Node eventType = 
metadata.getElementsByTagNameNS(URI_nmwg[nmwg_version],"eventType").item(0);
-            if (eventType != null) {
-                String event = eventType.getFirstChild().getNodeValue();
-                if (event.startsWith("error.")) {
-                    if (exception == null) {
-                        MAEndpoint endpoint = null;
-                        if (userData != null) endpoint = 
userData.getEndpoint();
-                        exception = new 
PSErrorCodeException(endpoint,null,null);
-                    }
-                    exception.setErrorCode(event);
-                    logger.error(event);
-                    //fireAxisCallException(userData, x);
-                    
-                    NodeList datum  = 
data.getElementsByTagNameNS(URI_nmwgr,IUserData.C_DATUM);
-                    
-                    if ((datum!=null) && (datum.getLength()>0)) {
-                        for (int i=0; i < datum.getLength();i++) {
-                             org.w3c.dom.Element d = 
(org.w3c.dom.Element)datum.item(i);
-                             String description = d.getTextContent();
-                             if (exception == null) {
-                                 MAEndpoint endpoint = null;
-                                 if (userData != null) endpoint = 
userData.getEndpoint();
-                                 if (exception == null)
-                                     exception = new 
PSErrorCodeException(endpoint,null,null);
-                                 exception.setMaEndpoint(endpoint);
-                             }
-                             exception.setErrordescription(description);
-                             //logger.warn(">>\t" + userData.getId() + '\t'+ 
userData.getHostname(AbstractUserData.ID_RESPONSE) + '\t' + 
d.getTextContent());
-                        }
-                    }
-                    if (exception != null) {
-                        logger.error(event);
-                        fireAxisCallException(userData, exception);
-                    }
-                    if (userData != null)
-                        
userData.setResponse(AbstractUserData.C_STATUS,exception.getFullMessage());   
                           
-                } else {if (userData != null) 
userData.setResponse(AbstractUserData.C_STATUS,"OK");}    
-            } else {if (userData != null) 
userData.setResponse(AbstractUserData.C_STATUS,"OK");}
-        }
-        
-    }
        protected void processMetadata(Node metadata, IUserData userData) {
         processMetadata(metadata, (UserData) userData);
     }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarResponse.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarResponse.java
  2008-06-17 16:16:46 UTC (rev 4017)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarResponse.java
  2008-06-18 10:33:12 UTC (rev 4018)
@@ -36,6 +36,7 @@
  *
  */
 public interface IPerfsonarResponse extends PropertyChangeListener {
+       public static final String ErrorResponse = "ErrorResponse";
        public static final String MA_MetadataKeyResponse = 
"MetadataKeyResponse";
     public static final String MA_SetupDataResponse = "SetupDataResponse";
     /**