perfsonar development work

Author: yi
Date: 2006-11-13 16:51:02 -0500 (Mon, 13 Nov 2006)
New Revision: 1752

Modified:
   
branches/yi-udel/perfsonar/schema/example-instances/sonar/LS/test/LSQueryRequest.xml
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
Log:
A minor correct in LSRegister using BDB;
Add BDB version equivalent query in LSQueryRequest.xml

Modified: 
branches/yi-udel/perfsonar/schema/example-instances/sonar/LS/test/LSQueryRequest.xml
===================================================================
--- 
branches/yi-udel/perfsonar/schema/example-instances/sonar/LS/test/LSQueryRequest.xml
        2006-11-13 07:58:28 UTC (rev 1751)
+++ 
branches/yi-udel/perfsonar/schema/example-instances/sonar/LS/test/LSQueryRequest.xml
        2006-11-13 21:51:02 UTC (rev 1752)
@@ -24,13 +24,25 @@
   <nmwg:metadata id="meta1">  
     <xquery:subject id="sub1">
 
+       <!-- eXist 
       declare namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";;
       declare namespace nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";;
       for $m in 
/nmwg:store[@type='LSStore'
 or @type='LSCache']/nmwg:metadata
       for $d in 
/nmwg:store[@type='LSStore'
 or @type='LSCache']/nmwg:data
       where $m/@id=$d/@metadataIdRef and 
$d//nmwgt:hostName/text()[fn:matches(.,'.*.abilene.ucaid.edu')]
       return $m
-      
+    -->
+    
+    <!-- Berkeley DB -->
+      declare namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";;
+      declare namespace nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";;
+      let $collection := (collection ("LSStore.dbxml") | collection 
("LSCache.dbxml"))
+      for $m in $collection/nmwg:metadata,
+             $d in $collection/nmwg:data
+      where $m/@id=$d/@metadataIdRef and matches ($d//nmwgt:hostName/text(), 
".*.abilene.ucaid.edu")
+      return $m
+    
+    
     </xquery:subject>
     <nmwg:eventType>service.lookup.xquery</nmwg:eventType>
     

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
    2006-11-13 07:58:28 UTC (rev 1751)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
    2006-11-13 21:51:02 UTC (rev 1752)
@@ -503,11 +503,11 @@
             else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
                 String insertData = null;
                 if(summaryParam == null) {
-                    insertData = XMLUtils.serializeXML(requestMetadata);
+                    insertData = XMLUtils.serializeXML(requestData);
                     
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_STORE_CONTAINER,
 insertData);
                 }
                else {
-                    insertData = XMLUtils.serializeXML(requestMetadata);
+                    insertData = XMLUtils.serializeXML(requestData);
                     
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_CACHE_CONTAINER,
 insertData);
                }
             }