perfsonar development work

Author: roman
Date: 2007-09-28 06:09:34 -0400 (Fri, 28 Sep 2007)
New Revision: 2877

Modified:
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
Log:

xquery now supports both solutions: eventType element and supportedEventType 
parameter in metadata config file (metadata element)




Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
     2007-09-27 14:11:10 UTC (rev 2876)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
     2007-09-28 10:09:34 UTC (rev 2877)
@@ -151,8 +151,16 @@
             + "    where 1                              \n";
 
 
+        /*
         if (eventType != null)
             xQuery += "and $i/nmwg:eventType[functx:trim(text())='" + 
eventType + "'] ";
+        */
+        if (eventType != null)
+            xQuery += "and 
(($i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='" + eventType + "' 
and functx:trim(@name)='supportedEventType') "
+                                                       + "or 
(functx:trim(@value)='" + eventType + "' and 
functx:trim(@name)='supportedEventType')]) "
+                         + "or "
+                         + "($i/nmwg:eventType[functx:trim(text())='" + 
eventType + "'])"
+                        + ") ";
 
         if (ipAddress != null) {
             if (ipAddress.equals(""))