perfsonar development work

Author: yi
Date: 2006-11-15 11:48:47 -0500 (Wed, 15 Nov 2006)
New Revision: 1762

Modified:
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
Log:
1. fix the problem of array out boundary during LocalPeer and Global Peer test
2. fix the some of the incorrect calls of BDB function

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
  2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
  2006-11-15 16:48:47 UTC (rev 1762)
@@ -64,8 +64,8 @@
     final static boolean DEBUG = false;
     
     // default Berkeley database environment path
-//    final static String XML_DB_HOME = "/home/gabyfox/xmldb";
-    final static String XML_DB_HOME = "/home/jason/xmldb";
+    final static String XML_DB_HOME = "/home/gabyfox/xmldb";
+    //final static String XML_DB_HOME = "/home/jason/xmldb";
     
//------------------------------------------------------------------------
     
     private Environment myEnv;

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
 2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
 2006-11-15 16:48:47 UTC (rev 1762)
@@ -155,7 +155,7 @@
                 }              
                        
                //see what was returned          
-                if(results[0].equals("")) {
+                if(results.length == 0 || results[0].equals("")) {
                    //if we got nothing, we need to be inserted into the peer 
list
                    
                     logger.debug("LSGlobalTokenAction: We are not In 
there!");
@@ -175,10 +175,8 @@
                         xmlStorageManager.fetch(insert);
                     }
                     else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
-                       String xPath = "/";
                        String insertData = 
XMLUtils.serializeXML(peerMetadata);
-                       
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_GLOBAL_PEER_CONTAINER,
 
-                           XQUERY_UPDATE_DECLARE, xPath, insertData);
+                       
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_GLOBAL_PEER_CONTAINER,
 insertData);
                     }          
 
                    logger.debug("LSGlobalTokenAction: Done Adding Us");
@@ -222,7 +220,7 @@
                throw new SystemException("error.common.storage.xmldb.query", 
"No database exists");
             }      
                 
-            if(results[0].equals("")) {
+            if(results.length == 0 || results[0].equals("")) {
                 String m = "LSGlobalTokenAction: " +
                           "Peer List is empty; please populate it with at 
least one peer.";
                logger.error(m);
@@ -490,7 +488,7 @@
                        throw new 
SystemException("error.common.storage.xmldb.query", "No database exists");
                     }
 
-                    if(results[0].equals("")) {                              
                          
+                    if(results.length == 0 || results[0].equals("")) {       
                                          
                        //not in there, add it
                         logger.debug("LSGlobalTokenAction: MESSAGE  MD 
Ready, inserting...");
 
@@ -502,10 +500,8 @@
                             xmlStorageManager.fetch(insert);
                         }
                         else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
-                           String xPath = "/";
                            String insertData = 
XMLUtils.serializeXML(tokenMD);
-                           
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_GLOBAL_PEER_CONTAINER,
 
-                               XQUERY_UPDATE_DECLARE, xPath, insertData);
+                           
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_GLOBAL_PEER_CONTAINER,
 insertData);
                         }      
                                        
                        logger.debug("LSGlobalTokenAction: MESSAGE  Done 
Adding");                

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
  2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
  2006-11-15 16:48:47 UTC (rev 1762)
@@ -155,7 +155,7 @@
                 }              
                        
                //see what was returned          
-                if(results[0].equals("")) {
+                if(results.length == 0 || results[0].equals("")) {
                    //if we got nothing, we need to be inserted into the peer 
list
                    
                     logger.debug("LSLocalTokenAction: We are not In there!");
@@ -175,10 +175,8 @@
                         xmlStorageManager.fetch(insert);
                     }
                     else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
-                       String xPath = "/";
                        String insertData = 
XMLUtils.serializeXML(peerMetadata);
-                       
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_LOCAL_PEER_CONTAINER,
 
-                           XQUERY_UPDATE_DECLARE, xPath, insertData);
+                       
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_LOCAL_PEER_CONTAINER,
 insertData);
                     }          
 
                    logger.debug("LSLocalTokenAction: Done Adding Us");
@@ -222,7 +220,7 @@
                throw new SystemException("error.common.storage.xmldb.query", 
"No database exists");
             }      
                 
-            if(results[0].equals("")) {
+            if(results.length == 0 || results[0].equals("")) {
                 String m = "LSLocalTokenAction: " +
                           "Peer List is empty; please populate it with at 
least one peer.";
                logger.error(m);
@@ -490,7 +488,7 @@
                        throw new 
SystemException("error.common.storage.xmldb.query", "No database exists");
                     }
 
-                    if(results[0].equals("")) {                              
                          
+                    if(results.length == 0 || results[0].equals("")) {       
                                          
                        //not in there, add it
                         logger.debug("LSLocalTokenAction: MESSAGE  MD Ready, 
inserting...");
 
@@ -502,10 +500,8 @@
                             xmlStorageManager.fetch(insert);
                         }
                         else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
-                           String xPath = "/";
                            String insertData = 
XMLUtils.serializeXML(tokenMD);
-                           
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_LOCAL_PEER_CONTAINER,
 
-                               XQUERY_UPDATE_DECLARE, xPath, insertData);
+                           
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_LOCAL_PEER_CONTAINER,
 insertData);
                         }      
                                        
                        logger.debug("LSLocalTokenAction: MESSAGE  Done 
Adding");                 

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-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
    2006-11-15 16:48:47 UTC (rev 1762)
@@ -223,7 +223,7 @@
                            throw new 
SystemException("error.common.storage.xmldb.query", "No database exists");
                         }
                                 
-                        if(results[0].equals("")) {
+                        if(results.length == 0 || results[0].equals("")) {
                             String m = "LSRegisterAction: Peer List is 
empty; please populate it with at least one peer.";
                            logger.error(m);
                            throw new 
SystemException("error.ls.peer_list_empty", m);     

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-15 16:48:47 UTC (rev 1762)
@@ -164,7 +164,7 @@
         }
 
         //Make sure we got something (don't want to do this on an empty set)
-        if(results[0] != null) {
+        if(results.length != 0 && results[0] != null) {
             logger.debug("LSSummary: XSLT Starting...");
             try {
         

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
    2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
    2006-11-15 16:48:47 UTC (rev 1762)
@@ -355,7 +355,7 @@
             throw new SystemException("error.common.storage.xmldb.query", 
"No database exists");
         }
 
-        if(results[0].equals("")) {
+        if(results.length == 0 || results[0].equals("")) {
           String m = "LSTokenUtilities: " +
                     "Peer List is empty; please populate it with at least 
one peer.";
           logger.error(m);
@@ -587,15 +587,15 @@
         else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {  
      
             if(kind.equals("local")) {
                 query = XQUERY_UPDATE_DECLARE + "data(collection(\"" + 
LS_LOCAL_PEER_CONTAINER + 
-                       
"\")/nmwg:metadata[@id='"
 + ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+                       
"\")/nmwg:metadata[@id=\""
 + ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
                         requestMetadata.getSubject()).getService().
-                        getAccessPoint().getAccessPoint() + "'])";
+                        getAccessPoint().getAccessPoint() + "\"])";
             }
             else if(kind.equals("global")) {
                 query = XQUERY_UPDATE_DECLARE + "data(collection(\"" + 
LS_GLOBAL_PEER_CONTAINER + 
-                       
"\")/nmwg:metadata[@id='"
 + ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+                       
"\")/nmwg:metadata[@id=\""
 + ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
                         requestMetadata.getSubject()).getService().
-                        getAccessPoint().getAccessPoint() + "'])";
+                        getAccessPoint().getAccessPoint() + "\"])";
             }      
             edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
             results = (String[])edbres.getResultAsStringArray();
@@ -605,7 +605,7 @@
         }
 
 
-        if(results[0].equals("")) {
+        if(results.length == 0 || results[0].equals("")) {
 
             logger.debug("LSTokenUtilities: MESSAGE  LS is not In there!");
             //if we are not, make us
@@ -661,16 +661,12 @@
             }
             else if(xmlStorageManager instanceof 
BerkeleyDbXmlStorageManager) {
                 if(kind.equals("local")) {             
-                   String xPath = "/";
                    String insertData = XMLUtils.serializeXML(peerMetadata);
-                   
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_LOCAL_PEER_CONTAINER,
 
-                       XQUERY_UPDATE_DECLARE, xPath, insertData);
+                   
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_LOCAL_PEER_CONTAINER,
 insertData);
                 }
                 else if(kind.equals("global")) {
-                   String xPath = "/";
                    String insertData = XMLUtils.serializeXML(peerMetadata);
-                   
((BerkeleyDbXmlStorageManager)xmlStorageManager).insert(LS_GLOBAL_PEER_CONTAINER,
 
-                       XQUERY_UPDATE_DECLARE, xPath, insertData);
+                   
((BerkeleyDbXmlStorageManager)xmlStorageManager).insertDocument(LS_GLOBAL_PEER_CONTAINER,
 insertData);
                 }          
             }  
 
@@ -801,7 +797,7 @@
         }      
        
         
-        if(results[0].equals("")) {
+        if(results.length == 0 || results[0].equals("")) {
             String m = "LSTokenUtilities: " +
                       "Peer List is empty; please populate it with at least 
one peer.";
             logger.error(m);
@@ -838,7 +834,7 @@
 
 
         //Make sure we got something (don't want to do this on an empty set)
-        if(results[0] != null) {
+        if(results.length != 0 && results[0] != null) {
             logger.debug("LSTokenUtilities: XSLT Starting...");
             try {
         

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
      2006-11-14 15:30:53 UTC (rev 1761)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
      2006-11-15 16:48:47 UTC (rev 1762)
@@ -44,8 +44,8 @@
     /**
      * Service database type: "eXist or BDB"
      */
-//  private static final String SERVICE_DATABASE_TYPE = "BDB";
-    private static final String SERVICE_DATABASE_TYPE = "eXist";
+       private static final String SERVICE_DATABASE_TYPE = "BDB";
+//    private static final String SERVICE_DATABASE_TYPE = "eXist";
 
 
     /**