perfsonar development work

Author: yi
Date: 2006-11-15 15:15:23 -0500 (Wed, 15 Nov 2006)
New Revision: 1763

Modified:
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSCleanup.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
Log:
fix the problem of re-registering the same summary data

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSCleanup.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSCleanup.java
   2006-11-15 16:48:47 UTC (rev 1762)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSCleanup.java
   2006-11-15 20:15:23 UTC (rev 1763)
@@ -218,18 +218,10 @@
        }
        else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
            query = "declare namespace 
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; " +
-                   "data(collection(\"" + LS_STORE_CONTAINER + 
"\")/nmwg:metadata/@id)";
+                   "data((collection(\"" + LS_STORE_CONTAINER + "\") | 
collection(\"" + LS_CACHE_CONTAINER + "\"))/nmwg:metadata/@id)";
            XmlDbResult edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
-           String[] res1 = (String[])edbres.getResultAsStringArray();
-           query = "declare namespace 
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; " +
-                   "data(collection(\"" + LS_CACHE_CONTAINER + 
"\")/nmwg:metadata/@id)";
-           edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
-           String[] res2 = (String[])edbres.getResultAsStringArray();
+           String[] res = (String[])edbres.getResultAsStringArray();
 
-           String[] res = new String[res1.length + res2.length];
-           System.arraycopy(res1, 0, res, 0, res1.length);
-           System.arraycopy(res2, 0, res, res1.length, res2.length);
-
            return res;
        }
        else {

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
     2006-11-15 16:48:47 UTC (rev 1762)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGenericRegisterAction.java
     2006-11-15 20:15:23 UTC (rev 1763)
@@ -323,7 +323,7 @@
             }
             else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
                query = "declare namespace 
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; " +
-                       "data(collection(\"" + LS_STORE_CONTAINER + 
"\")/nmwg:metadata[@id=\""
 + key + "\"]/@id)"; 
+                       "data((collection(\"" + LS_STORE_CONTAINER + "\") | 
collection(\"" + LS_CACHE_CONTAINER + 
"\"))/nmwg:metadata[@id=\""
 + key + "\"]/@id)";  
                res = (XmlDbResult)xmlStorageManager.fetch(query);
             }
             else {