perfsonar development work

Author: roman
Date: 2006-07-28 06:32:57 -0400 (Fri, 28 Jul 2006)
New Revision: 1496

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
Log:
use of recent changes in XMLUtils

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-28 09:52:34 UTC (rev 1495)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/MetadataConfigurationStorageManager.java
        2006-07-28 10:32:57 UTC (rev 1496)
@@ -198,8 +198,9 @@
             //logger.debug("MetadataConfigurationStorageManager.fetch: xml 
result: "
             //         + xmlResult);
 
+            String[] tagNames = {"metadata"};
             Map metadatas =
-                transformations.transformResults(xmlResult, "metadata");
+                transformations.transformResults(xmlResult, tagNames);
 
             logger.debug("MetadataConfigurationStorageManager.fetch: "
                        + "number of metadata elements fetched from "
@@ -382,7 +383,8 @@
         if (xmlResults[0].trim().equals("")) return null;
 
 
-        Map datas = transformations.transformResults(xmlResults[0], "data");
+        String[] tagNames = {"data"};
+        Map datas = transformations.transformResults(xmlResults[0], 
tagNames);
 
         logger.debug("MetadataConfigurationStorageManager.getData: "
                                + "number of data elements fetched from "

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManager.java
  2006-07-28 09:52:34 UTC (rev 1495)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/SimpleMetadataConfigurationStorageManager.java
  2006-07-28 10:32:57 UTC (rev 1496)
@@ -192,8 +192,9 @@
                                         + outputBuffer.toString()
                                         + "\n</nmwg:message>";
 
+                    String[] tagNames = {"metadata"};
                     Map metadatas =
-                        transformations.transformResults(output, "metadata");
+                        transformations.transformResults(output, tagNames);
 
                     
logger.debug("SimpleMetadataConfigurationStorageManager.fetch: "
                                + "number of metadata elements fetched from "
@@ -357,7 +358,8 @@
 
                     Data data = null;
 
-                    Map datas = transformations.transformResults(output, 
"data");
+                    String[] tagNames = {"data"};
+                    Map datas = transformations.transformResults(output, 
tagNames);
 
                     
logger.debug("SimpleMetadataConfigurationStorageManager.getData: "
                                        + "number of data elements fetched 
from "

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
    2006-07-28 09:52:34 UTC (rev 1495)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/Transformations.java
    2006-07-28 10:32:57 UTC (rev 1496)
@@ -150,9 +150,9 @@
 
 
     /**
-     *  Returns nmwg object with specific tag name parsed from xml string
+     *  Returns nmwg objects with specific tag names parsed from xml string
      */
-    public Map<String, Element> transformResults(String xmlPart, String 
tagName)
+    public Map<String, Element> transformResults(String xmlPart, String[] 
tagNames)
         throws SystemException {
 
         String f = "";
@@ -165,7 +165,7 @@
                     + "Unable to read service.sax_parser.config property 
properly");
         }
 
-        return XMLUtils.getElementFromXML(xmlPart, tagName, f);
+        return XMLUtils.getElementFromXML(xmlPart, tagNames, f);
 
     }