Changeset 31190 for main/trunk/gli

Timestamp:

2016-12-09T21:37:52+13:00 (7 years ago)

Author:

ak19

Message:

First major commit to do with the new oaiinfo db that keeps track of which oids are deleted. Still need to fix up issue with the new remove and rename subroutines of dbutil's jdbm not being called to clean up *.lg log file associated with main db file. Still need to clean up unused methods in oaiinfo, remove debugging and test agains GS3 incr-build-with-manifest tutorial. (Previous 3 commits were commits, not all related.)

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -221 +221 @@
     // but GLI won't do moving building to index
     
-    if(CollectionManager.isSolrCollection()) {
+    //if(CollectionManager.isSolrCollection()) {
         command_parts_list.add("-activate");
-    }
+        //}
 
     if(Gatherer.GS3) {
@@ -1763 +1763 @@
         
         else if(installCollection()) {
-            // If we have a local library running then ask it to add our newly create collection
+            // If we have a local library running then ask it to add our newly created collection
             if (LocalLibraryServer.isRunning() == true) {
                 LocalLibraryServer.addCollection(collection.getName());
@@ -2047 +2047 @@
         Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection.getName());
         }
+        /*
         File index_dir = new File(getLoadedCollectionIndexDirectoryPath());
         DebugStream.println("Index = " + index_dir.getAbsolutePath());
@@ -2088 +2089 @@
         moveContentsInto(building_dir, index_dir);
         }
+
+        // move oai tmpdb to oai livedb
+        */
+        
     }
     catch (Exception exception) {