perfsonar development work

Author: roman
Date: 2007-10-09 08:53:34 -0400 (Tue, 09 Oct 2007)
New Revision: 2935

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

support of eventType element and supportedEventType parameter added




Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
    2007-10-09 12:16:41 UTC (rev 2934)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
    2007-10-09 12:53:34 UTC (rev 2935)
@@ -109,29 +109,32 @@
         if (subject == null) {
 
             xQuery = 
-                " let $nodeMetadata :=                                       
                                              \n"
-                + "     for $i in //nmwg:metadata                            
                                              \n"
-                + "     where $i/nmwg:subject/nmwgtopo3:node                 
                                              \n"
-                + "     return $i                                            
                                              \n"
-                + "                                                          
                                              \n"
-                + " let $linkMetadata :=                                     
                                              \n"
-                + "     for $k in //nmwg:metadata                            
                                              \n"
-                + "     where 
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
  \n"
-                + "     return $k                                            
                                              \n"
-                + "                                                          
                                              \n"
-                + " let $metaids :=                                          
                                              \n"
-                + "     for $j in $linkMetadata                              
                                              \n"
-                + "     return fn:data($j/@id)                               
                                              \n"
-                + "                                                          
                                              \n"
-                + " let $datas :=                                            
                                              \n"
-                + "     for $k in $metaids                                   
                                              \n"
-                + "         let $d :=                                        
                                              \n"
-                + "             for $l in //nmwg:data                        
                                              \n"
-                + "             where fn:data($l/@metadataIdRef) = $k        
                                              \n"
-                + "             return $l                                    
                                              \n"
-                + "     return $d                                            
                                              \n"
-                + "                                                          
                                              \n"
-                + " return ($nodeMetadata, $linkMetadata, $datas)            
                                              \n";
+                " let $nodeMetadata :=                                       
                                               \n"
+                + "     for $i in //nmwg:metadata                            
                                               \n"
+                + "     where $i/nmwg:subject/nmwgtopo3:node                 
                                               \n"
+                + "     return $i                                            
                                               \n"
+                + "                                                          
                                               \n"
+                + " let $linkMetadata :=                                     
                                               \n"
+                + "     for $k in //nmwg:metadata                            
                                               \n"
+                + "     where 
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
   \n"
+                + "           or                                             
                                               \n"
+                + "           
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
 and functx:trim(@name)='supportedEventType')   \n"
+                + "                                           or 
(functx:trim(@value)='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and 
functx:trim(@name)='supportedEventType')]  \n"
+                + "     return $k                                            
                                               \n"
+                + "                                                          
                                               \n"
+                + " let $metaids :=                                          
                                               \n"
+                + "     for $j in $linkMetadata                              
                                               \n"
+                + "     return fn:data($j/@id)                               
                                               \n"
+                + "                                                          
                                               \n"
+                + " let $datas :=                                            
                                               \n"
+                + "     for $k in $metaids                                   
                                               \n"
+                + "         let $d :=                                        
                                               \n"
+                + "             for $l in //nmwg:data                        
                                               \n"
+                + "             where fn:data($l/@metadataIdRef) = $k        
                                               \n"
+                + "             return $l                                    
                                               \n"
+                + "     return $d                                            
                                               \n"
+                + "                                                          
                                               \n"
+                + " return ($nodeMetadata, $linkMetadata, $datas)            
                                               \n";
 
             xQuery = ns + xQuery;
 
@@ -158,14 +161,19 @@
         if (linkGlobalName != "") {
 
             xQuery = ""
-                   + "                                                       
                                                       \n"
+                   + "\n"
                    + " let $globalName := '" + linkGlobalName + "'           
                                                       \n"
                    + "                                                       
                                                       \n"
                    + " let $linkMetadata :=                                  
                                                       \n"
                    + "     if ($globalName != '') then                       
                                                       \n"
                    + "         for $m in //nmwg:metadata                     
                                                       \n"
-                   + "         where 
functx:trim(fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName)) = 
functx:trim(fn:lower-case($globalName))        \n"
-                   + "             and 
$m/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
  \n"
+                   + "         where 
functx:trim(fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName)) = 
functx:trim(fn:lower-case($globalName)) \n"
+                   + "             and (                                     
                                                       \n"
+                   + "               
$m/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
    \n"
+                   + "               or                                      
                                                       \n"
+                   + "               
$m/nmwg:parameters/nmwg:parameter[(functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
 and functx:trim(@name)='supportedEventType')  \n"
+                   + "                                              or 
(functx:trim(@value)='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and 
functx:trim(@name)='supportedEventType')] \n"
+                   + "             )                                         
                                                       \n"
                    + "         return $m                                     
                                                       \n"
                    + "     else                                              
                                                       \n"
                    + "         ''                                            
                                                       \n"
@@ -283,44 +291,49 @@
                             + "         ''                                   
                        \n";
 
 
-                xQuery = "                                                   
                                                   \n "
-                    + "                                                      
                                                   \n "
+                xQuery = "\n "
+                    + "\n "
                     + node1
                     + node2
-                    + "                                                      
                                                   \n"
-                    + " let $linkMetadata :=                                 
                                                   \n"
-                    + "     if ($node1_id != '' and $node2_id != '') then    
                                                   \n"
-                    + "         for $k in //nmwg:metadata                    
                                                   \n"
-                    + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id     
            \n"
-                    + "             and 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id     
          \n"
-                    + "             and 
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
  \n"
-                    + "         return $k                                    
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " let $metaids :=                                      
                                                   \n"
-                    + "     if ($linkMetadata != '') then                    
                                                   \n"
-                    + "         for $j in $linkMetadata                      
                                                   \n"
-                    + "         return fn:data($j/@id)                       
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " let $datas :=                                        
                                                   \n"
-                    + "     if ($metaids != '') then                         
                                                   \n"
-                    + "         for $k in $metaids                           
                                                   \n"
-                    + "             let $d :=                                
                                                   \n"
-                    + "                 for $l in //nmwg:data                
                                                   \n"
-                    + "                 where fn:data($l/@metadataIdRef) = 
$k                                                   \n"
-                    + "                 return $l                            
                                                   \n"
-                    + "         return $d                                    
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " return                                               
                                                   \n"
-                    + "     if ($linkMetadata != '') then                    
                                                   \n"
-                    + "         ($node1_metadata, $node2_metadata, 
$linkMetadata, $datas)                                       \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   ";
+                    + "                                                      
                                                     \n"
+                    + " let $linkMetadata :=                                 
                                                     \n"
+                    + "     if ($node1_id != '' and $node2_id != '') then    
                                                     \n"
+                    + "         for $k in //nmwg:metadata                    
                                                     \n"
+                    + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id     
              \n"
+                    + "             and 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id     
            \n"
+                    + "             and (                                    
                                                     \n"
+                    + "                      
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
 \n"
+                    + "               or                                     
                                                     \n"
+                    + "               
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
 and functx:trim(@name)='supportedEventType')  \n"
+                    + "                                              or 
(functx:trim(@value)='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and 
functx:trim(@name)='supportedEventType')]  \n"
+                    + "             )                                        
                                                     \n"
+                    + "         return $k                                    
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " let $metaids :=                                      
                                                     \n"
+                    + "     if ($linkMetadata != '') then                    
                                                     \n"
+                    + "         for $j in $linkMetadata                      
                                                     \n"
+                    + "         return fn:data($j/@id)                       
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " let $datas :=                                        
                                                     \n"
+                    + "     if ($metaids != '') then                         
                                                     \n"
+                    + "         for $k in $metaids                           
                                                     \n"
+                    + "             let $d :=                                
                                                     \n"
+                    + "                 for $l in //nmwg:data                
                                                     \n"
+                    + "                 where fn:data($l/@metadataIdRef) = 
$k                                                     \n"
+                    + "                 return $l                            
                                                     \n"
+                    + "         return $d                                    
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " return                                               
                                                     \n"
+                    + "     if ($linkMetadata != '') then                    
                                                     \n"
+                    + "         ($node1_metadata, $node2_metadata, 
$linkMetadata, $datas)                                         \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     ";
 
             } else if (nodeArray.length == 1){
 
@@ -353,42 +366,47 @@
                             + "         
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id)                    \n"
                             + "     else                                     
                           \n"
                             + "         ''                                   
                           \n";
-                xQuery = "                                                   
                                                   \n "
-                    + "                                                      
                                                   \n "
+                xQuery = "\n "
+                    + "\n "
                     + node
-                    + "                                                      
                                                   \n"
-                    + " let $linkMetadata :=                                 
                                                   \n"
-                    + "     if ($node_id != '') then                         
                                                   \n"
-                    + "         for $k in //nmwg:metadata                    
                                                   \n"
-                    + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id      
            \n"
-                    + "             and 
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
  \n"
-                    + "         return $k                                    
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " let $metaids :=                                      
                                                   \n"
-                    + "     if ($linkMetadata != '') then                    
                                                   \n"
-                    + "         for $j in $linkMetadata                      
                                                   \n"
-                    + "         return fn:data($j/@id)                       
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " let $datas :=                                        
                                                   \n"
-                    + "     if ($metaids != '') then                         
                                                   \n"
-                    + "         for $k in $metaids                           
                                                   \n"
-                    + "             let $d :=                                
                                                   \n"
-                    + "                 for $l in //nmwg:data                
                                                   \n"
-                    + "                 where fn:data($l/@metadataIdRef) = 
$k                                                   \n"
-                    + "                 return $l                            
                                                   \n"
-                    + "         return $d                                    
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   \n"
-                    + "                                                      
                                                   \n"
-                    + " return                                               
                                                   \n"
-                    + "     if ($linkMetadata != '') then                    
                                                   \n"
-                    + "         ($node_metadata, $linkMetadata, $datas)      
                                                   \n"
-                    + "     else                                             
                                                   \n"
-                    + "         ''                                           
                                                   ";
+                    + "                                                      
                                                     \n"
+                    + " let $linkMetadata :=                                 
                                                     \n"
+                    + "     if ($node_id != '') then                         
                                                     \n"
+                    + "         for $k in //nmwg:metadata                    
                                                     \n"
+                    + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id      
              \n"
+                    + "             and (                                    
                                                     \n"
+                    + "                      
$k/nmwg:eventType[functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status']
 \n"
+                    + "               or                                     
                                                     \n"
+                    + "               
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
 and functx:trim(@name)='supportedEventType')  \n"
+                    + "                                              or 
(functx:trim(@value)='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and 
functx:trim(@name)='supportedEventType')] \n"
+                    + "             )                                        
                                                     \n"
+                    + "         return $k                                    
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " let $metaids :=                                      
                                                     \n"
+                    + "     if ($linkMetadata != '') then                    
                                                     \n"
+                    + "         for $j in $linkMetadata                      
                                                     \n"
+                    + "         return fn:data($j/@id)                       
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " let $datas :=                                        
                                                     \n"
+                    + "     if ($metaids != '') then                         
                                                     \n"
+                    + "         for $k in $metaids                           
                                                     \n"
+                    + "             let $d :=                                
                                                     \n"
+                    + "                 for $l in //nmwg:data                
                                                     \n"
+                    + "                 where fn:data($l/@metadataIdRef) = 
$k                                                     \n"
+                    + "                 return $l                            
                                                     \n"
+                    + "         return $d                                    
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     \n"
+                    + "                                                      
                                                     \n"
+                    + " return                                               
                                                     \n"
+                    + "     if ($linkMetadata != '') then                    
                                                     \n"
+                    + "         ($node_metadata, $linkMetadata, $datas)      
                                                     \n"
+                    + "     else                                             
                                                     \n"
+                    + "         ''                                           
                                                     ";
 
             }
 

Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
 2007-10-09 12:16:41 UTC (rev 2934)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
 2007-10-09 12:53:34 UTC (rev 2935)
@@ -120,6 +120,9 @@
                 + " let $linkMetadata :=                                     
                                           \n"
                 + "     for $k in //nmwg:metadata                            
                                           \n"
                 + "     where 
$k/nmwg:eventType[functx:trim(text())='Path.Status']                          
            \n"
+                + "           or                                             
                                           \n"
+                + "           
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='Path.Status' and 
functx:trim(@name)='supportedEventType')   \n"
+                + "                                          or 
(functx:trim(@value)='Path.Status' and 
functx:trim(@name)='supportedEventType')]  \n"
                 + "     return $k                                            
                                           \n"
                 + "                                                          
                                           \n"
                 + " let $metaids :=                                          
                                           \n"
@@ -161,14 +164,19 @@
         if (linkGlobalName != "") {
 
             xQuery = ""
-                   + "                                                       
                                                       \n"
+                   + "\n"
                    + " let $globalName := '" + linkGlobalName + "'           
                                                       \n"
                    + "                                                       
                                                       \n"
                    + " let $linkMetadata :=                                  
                                                       \n"
                    + "     if ($globalName != '') then                       
                                                       \n"
                    + "         for $m in //nmwg:metadata                     
                                                       \n"
-                   + "         where 
functx:trim(fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName)) = 
functx:trim(fn:lower-case($globalName))        \n"
-                   + "             and 
$m/nmwg:eventType[functx:trim(text())='Path.Status']  \n"
+                   + "         where 
functx:trim(fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName)) = 
functx:trim(fn:lower-case($globalName)) \n"
+                   + "             and (                                     
                                                       \n"
+                   + "               
$m/nmwg:eventType[functx:trim(text())='Path.Status']                          
                 \n"
+                   + "               or                                      
                                                       \n"
+                   + "               
$m/nmwg:parameters/nmwg:parameter[(functx:trim(text())='Path.Status' and 
functx:trim(@name)='supportedEventType')  \n"
+                   + "                                              or 
(functx:trim(@value)='Path.Status' and 
functx:trim(@name)='supportedEventType')] \n"
+                   + "             )                                         
                                                       \n"
                    + "         return $m                                     
                                                       \n"
                    + "     else                                              
                                                       \n"
                    + "         ''                                            
                                                       \n"
@@ -286,8 +294,8 @@
                             + "         ''                                   
                        \n";
 
 
-                xQuery = "                                                   
                                                   \n "
-                    + "                                                      
                                                   \n "
+                xQuery = "\n "
+                    + "\n "
                     + node1
                     + node2
                     + "                                                      
                                                   \n"
@@ -296,7 +304,12 @@
                     + "         for $k in //nmwg:metadata                    
                                                   \n"
                     + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id     
            \n"
                     + "             and 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id     
          \n"
-                    + "             and 
$k/nmwg:eventType[functx:trim(text())='Path.Status']                          
          \n"
+                    + "             and (                                    
                                                   \n"
+                    + "                      
$k/nmwg:eventType[functx:trim(text())='Path.Status']                          
            \n"
+                    + "               or                                     
                                                   \n"
+                    + "               
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='Path.Status' and 
functx:trim(@name)='supportedEventType')  \n"
+                    + "                                              or 
(functx:trim(@value)='Path.Status' and 
functx:trim(@name)='supportedEventType')] \n"
+                    + "             )                                        
                                                   \n"
                     + "         return $k                                    
                                                   \n"
                     + "     else                                             
                                                   \n"
                     + "         ''                                           
                                                   \n"
@@ -356,15 +369,20 @@
                             + "         
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id)         \n"
                             + "     else                                     
                           \n"
                             + "         ''                                   
                           \n";
-                xQuery = "                                                   
                                                   \n "
-                    + "                                                      
                                                   \n "
+                xQuery = "\n "
+                    + "\n "
                     + node
                     + "                                                      
                                                   \n"
                     + " let $linkMetadata :=                                 
                                                   \n"
                     + "     if ($node_id != '') then                         
                                                   \n"
                     + "         for $k in //nmwg:metadata                    
                                                   \n"
                     + "         where 
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id      
            \n"
-                    + "             and 
$k/nmwg:eventType[functx:trim(text())='Path.Status']                          
          \n"
+                    + "             and (                                    
                                                   \n"
+                    + "                      
$k/nmwg:eventType[functx:trim(text())='Path.Status']                          
            \n"
+                    + "               or                                     
                                                   \n"
+                    + "               
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='Path.Status' and 
functx:trim(@name)='supportedEventType')  \n"
+                    + "                                              or 
(functx:trim(@value)='Path.Status' and 
functx:trim(@name)='supportedEventType')] \n"
+                    + "             )                                        
                                                   \n"
                     + "         return $k                                    
                                                   \n"
                     + "     else                                             
                                                   \n"
                     + "         ''                                           
                                                   \n"