perfsonar development work

Author: roman
Date: 2007-10-15 08:25:37 -0400 (Mon, 15 Oct 2007)
New Revision: 2954

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

XQuery improved. Now you can search using type of ifAddress.

example metadata in request:

  <nmwg:metadata id="meta1">
    <netutil:subject id="subj1">
      <nmwgt:interface>
        <nmwgt:ifAddress type="ipv4"></nmwgt:ifAddress>
      </nmwgt:interface>
    </netutil:subject>
    
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
  </nmwg:metadata>



Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
        2007-10-15 11:27:12 UTC (rev 2953)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
        2007-10-15 12:25:37 UTC (rev 2954)
@@ -220,9 +220,10 @@
         }
 
         if (ifAddress != null) {
-               if (ifAddress.equals(""))
+               if (ifAddress.equals("") && ifAddressType == null)
                    throw new PerfSONARException("error.ma.query", 
"DiscardsQueryGenerator.getMetadataQuery: wrong ifAddress");
-            xQuery += "and 
$i/discards:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
+               if (!ifAddress.equals(""))
+                xQuery += "and 
$i/discards:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
         }
 
         if (ifIndex != null) {

Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
  2007-10-15 11:27:12 UTC (rev 2953)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
  2007-10-15 12:25:37 UTC (rev 2954)
@@ -219,9 +219,10 @@
         }
 
         if (ifAddress != null) {
-               if (ifAddress.equals(""))
+               if (ifAddress.equals("") && ifAddressType == null)
                    throw new PerfSONARException("error.ma.query", 
"ErrorsQueryGenerator.getMetadataQuery: wrong ifAddress");
-            xQuery += "and 
$i/errors:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
+               if (!ifAddress.equals(""))
+                   xQuery += "and 
$i/errors:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
         }
 
         if (ifIndex != null) {

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-10-15 11:27:12 UTC (rev 2953)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
     2007-10-15 12:25:37 UTC (rev 2954)
@@ -228,9 +228,10 @@
         }
 
         if (ifAddress != null) {
-            if (ifAddress.equals(""))
+            if (ifAddress.equals("") && ifAddressType == null)
                    throw new PerfSONARException("error.ma.query", 
"UtilizationQueryGenerator.getMetadataQuery: wrong ifAddress");
-            xQuery += "and 
$i/netutil:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
+            if (!ifAddress.equals(""))
+                xQuery += "and 
$i/netutil:subject/nmwgt:interface/nmwgt:ifAddress[functx:trim(text())='" + 
ifAddress + "'] ";
         }
 
         if (ifIndex != null) {