perfsonar development work

Author: roman
Date: 2006-07-21 06:12:31 -0400 (Fri, 21 Jul 2006)
New Revision: 1476

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
Log:
eventType in metadata configuration file is replaced by parameter element:

        <nmwg:parameters>
            <nmwg:parameter name="supportedEventType">...</nmwg:parameter>
        </nmwg:parameters>


Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
   2006-07-20 14:49:09 UTC (rev 1475)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
   2006-07-21 10:12:31 UTC (rev 1476)
@@ -137,7 +137,7 @@
         String xpathQuery = "";
 
         if (eventType != "")
-            xpathQuery += "//nmwg:eventType[text()='" + eventType + 
"']/parent::*";
+               xpathQuery +=  "//nmwg:parameters/nmwg:parameter[text()='" + 
eventType + "' and @name='supportedEventType']/parent::*/parent::*";
 
         if (ipAddress != "")
             xpathQuery += "//nmwgt:ipAddress[text()='" + ipAddress + 
"']/parent::*/parent::*/parent::*";