perfsonar development work

Author: nina
Date: 2007-12-05 10:19:58 -0500 (Wed, 05 Dec 2007)
New Revision: 3091

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/NMWGHelper.java
Log:
faster implementation of chaining

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/NMWGHelper.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/NMWGHelper.java  
2007-12-05 13:56:57 UTC (rev 3090)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/NMWGHelper.java  
2007-12-05 15:19:58 UTC (rev 3091)
@@ -133,9 +133,19 @@
                        Element metadata_element = 
metadataElements.get(data_element.getAttribute(IPerfsonarRequest.E_METADATAIDREF));
                        while (metadata_element != null) {
                                metadataChain.add(metadata_element);
-                               String idref = 
metadata_element.getAttribute(IPerfsonarRequest.E_METADATAIDREF);
-                               metadata_element = 
metadataElements.get(idref);
-                               metadataElements.remove(idref);
+                               
+                           NodeList select = 
metadata_element.getElementsByTagNameNS(namespace_select, nsSubject);
+                               
+                           if (select.getLength() > 0) {
+                               for (int i=0; i < select.getLength(); i++) 
+                                       if (select.item(i) instanceof 
Element) {
+                                             String metadataIDRef = 
((Element) select.item(i)).getAttribute(metadataIdRef);
+                                             
+                                             metadata_element = 
metadataElements.get(metadataIDRef);
+                                             
metadataElements.remove(metadataIDRef);
+                                             break; //for
+                                       }
+                           } else break;
                        }
                        process(data_element,metadataChain);