perfsonar development work

Author: roman
Date: 2009-02-02 08:34:19 -0500 (Mon, 02 Feb 2009)
New Revision: 4927

Modified:
   trunk/perfsonar_base/ant/const.properties
   trunk/perfsonar_base/pom.xml
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
Log:
xquery statement for iperf metadata and data elements updated



Modified: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties   2009-02-02 12:36:51 UTC (rev 
4926)
+++ trunk/perfsonar_base/ant/const.properties   2009-02-02 13:34:19 UTC (rev 
4927)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20081217
+version=1.0.20090202

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2009-02-02 12:36:51 UTC (rev 4926)
+++ trunk/perfsonar_base/pom.xml        2009-02-02 13:34:19 UTC (rev 4927)
@@ -7,7 +7,7 @@
        <artifactId>perfsonar-base</artifactId>
        <packaging>jar</packaging>
        <name>Perfsonar Base package</name>
-       <version>1.0.20081217</version>
+       <version>1.0.20090202</version>
        <description>
                The perfSONAR base provides a number of common, shared 
classes which can be used by 
                MA, MP and Clients. 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
  2009-02-02 12:36:51 UTC (rev 4926)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
  2009-02-02 13:34:19 UTC (rev 4927)
@@ -187,7 +187,7 @@
                 + "    return $i                                             
                                                                           \n"
                 + "\n"
                 + "let $datas :=                                             
                                                                           \n"
-                + "    
//nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[functx:trim(@name)='eventType'
 and functx:trim(text())='" + eventType + "']/parent::*/parent::*/parent::* 
\n"
+                + "    
//nmwg:data/nmwg:key/nmwg:parameters/nmwg:parameter[functx:trim(@name)='eventType'
 and (functx:trim(text())='" + eventType + "' or functx:trim(@value)='" + 
eventType + "')]/parent::*/parent::*/parent::* \n"
                 + "\n"
                 + "return ($res, $datas) \n";