perfsonar development work

Author: roman
Date: 2006-07-24 08:13:42 -0400 (Mon, 24 Jul 2006)
New Revision: 1483

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
Log:
supportedEventType parameter is added to the new metadata in the metadata 
configuration when store request is being processed (before the change 
eventType was added)

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-24 10:01:45 UTC (rev 1482)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/UtilizationQueryGenerator.java
   2006-07-24 12:13:42 UTC (rev 1483)
@@ -137,7 +137,8 @@
         String xpathQuery = "";
 
         if (eventType != "")
-               xpathQuery +=  "//nmwg:parameters/nmwg:parameter[text()='" + 
eventType + "' and @name='supportedEventType']/parent::*/parent::*";
+               xpathQuery +=  "//nmwg:parameters/nmwg:parameter[(text()='" + 
eventType + "' and @name='supportedEventType') "
+                                                       + "or (@value='" + 
eventType + "' and @name='supportedEventType')]/parent::*/parent::*";
 
         if (ipAddress != "")
             xpathQuery += "//nmwgt:ipAddress[text()='" + ipAddress + 
"']/parent::*/parent::*/parent::*";