perfsonar development work

Author: roman
Date: 2006-07-13 09:24:21 -0400 (Thu, 13 Jul 2006)
New Revision: 1417

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
Log:
support for requests which have eventType only

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
  2006-07-13 13:23:26 UTC (rev 1416)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/storageManager/queryGenerator/L2PathStatusQueryGenerator.java
  2006-07-13 13:24:21 UTC (rev 1417)
@@ -99,6 +99,33 @@
 
 
         Subject subject = (Subject) metadata.getSubject();
+
+        // situation when only eventType is provided in the request
+        if (subject == null) {
+
+               xpathQuery = 
+                       " 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 
fn:lower-case($k/nmwg:parameters/nmwg:parameter) = 
fn:lower-case('Path.Status')       \n"
+                   + "         and 
$k/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
                                  \n"
+                   + "     return $k                                         
                                                                              
                                    \n"
+                   + "                                                       
                                                                              
                                                    \n"
+                   + " return ($nodeMetadata, $linkMetadata)                 
                                                                              
            \n";
+
+               logger.debug(
+                    "L2PathStatusQueryGenerator.getMetadataQuery: "
+                    + "meta xpath/xquery query: "
+                   + xpathQuery);
+
+               return xpathQuery;
+
+        }
+        
         Link link = (Link) subject.getChildrenByType("link").get(0);
 
 
@@ -250,10 +277,10 @@
         }
 
 
-        //logger.debug(
-        //        "L2PathStatusQueryGenerator.getMetadataQuery: "
-        //        + "meta xpath/xquery query: "
-        //       + xpathQuery);
+        logger.debug(
+                "L2PathStatusQueryGenerator.getMetadataQuery: "
+                + "meta xpath/xquery query: "
+               + xpathQuery);