Changeset 32869 for main/trunk

Timestamp:

2019-03-05T20:46:53+13:00 (5 years ago)

Author:

ak19

Message:

1. Other possible return value from getCollectionListForSet() is now also a clone rather than the member variable because we don't want our destructive remove() operations affecting member variable data structures. 2. Cleaning up debugging.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -275 +275 @@
         Vector <String> subcolls = this.super_coll_map.get(set_spec);
         if (subcolls == null) {
-          logger.info("*** its new!!");
+          logger.info("*** it's new!!");
           // not in there yet
           subcolls = new Vector<String>();
@@ -295 +295 @@
     } // for each OAI enabled collection
     
-    
-    debugListActivatedCollections("List of collections after configuring Set Info");
-    return true;
+    return true;
   }
 
@@ -353 +351 @@
         } else {
             logger.error("@@@@ index == -1, could not find collection " + collName +  " in collection_name_list");
-        }
-        debugListActivatedCollections("After activation/deactivation: " + changedState);        
-    
+        }   
         return true;
     }
   }
-  
-    private void debugListActivatedCollections(String heading) {
-        
-        logger.info("#### " + heading + ", colls are: ");
-        for(int i = 0; i < collection_name_list.size(); i++) {
-            logger.info("###### collname: " + collection_name_list.get(i));
-            logger.info("###### state: " + collection_state_list.get(i));
-        }     
-    }
-  
-  private void debugPrintCurrentCollList(Vector<String> current_coll_list, String heading) {
-      logger.info("@@@@ " + heading + ", colls are: ");
-      for(int i = 0; i < current_coll_list.size(); i++) {
-          String coll = current_coll_list.get(i);
-          logger.info("@@@@@@ collname: " + coll);
-      }
-  }  
       
   /** process using strings - just calls process using Elements */
@@ -682 +661 @@
     // if a single collection, send to it
     // if a subset, send to the collection
-    Vector<String> current_coll_list = getCollectionListForSet(set_spec_str);
-    if(set_spec_str != null) {
-        logger.info(">>>> Set spec: " + set_spec_str);
-        debugPrintCurrentCollList(current_coll_list, "Before removing any deactivated colls. Set spec: " + set_spec_str);
-    }   
-    
+    Vector<String> current_coll_list = getCollectionListForSet(set_spec_str); // return value is now safe to modify such as with .remove() operations
     boolean single_collection = false;
     if (current_coll_list.size() == 1) {
@@ -705 +679 @@
     } else {
         
-        debugListActivatedCollections("doListRecordsOrIdentifiers");
-        
         for(int i = 0; i < collection_name_list.size(); i++) {          
             if(collection_state_list.get(i).equals(DEACTIVATED)) {
@@ -712 +684 @@
                 // remove from the list of collections for which we're going to get identifiers/records
                 // so we won't get identifiers/records for any deactivated collections
-                current_coll_list.remove(collName);
-                logger.info("@@@@ collection " + collName + " is still deactivated!");
+                current_coll_list.remove(collName);             
             }           
         }
@@ -723 +694 @@
             return OAIXML.createErrorMessage(errorCode, "OAI collections temporarily active. Likely because of collection rebuilding. Check back shortly.");
         }
-        
-        debugPrintCurrentCollList(current_coll_list, "After removing any deactivated colls");
     }
     if (set_spec_str != null && set_spec_str.indexOf(":") != -1) {
@@ -866 +835 @@
       // Important to return a clone of the member variable, since collection names can be locally removed from the Vector by
       // the caller for any collection that is deactivated. This is so the caller can determine which collections are active and
-      // thus have records/identifiers to display. We don't want to remove elements from the member variable collection_name_list.
+      // thus have records/identifiers to display. We don't want to remove elements from the member variable collection_name_list itself.
       return (Vector<String>)this.collection_name_list.clone();
     }
     if (has_super_colls && super_coll_map.containsKey(set)) {
-      return super_coll_map.get(set);
+      Vector<String> supercoll_list = super_coll_map.get(set);
+      return (Vector<String>)supercoll_list.clone(); // see comment just above, don't want member data structure modified by caller's destructive operations
     }