Changeset 31190 for main/trunk/gli

Show
Ignore:
Timestamp:
09.12.2016 21:37:52 (3 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.)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

    r29711 r31190  
    221221    // but GLI won't do moving building to index 
    222222     
    223     if(CollectionManager.isSolrCollection()) { 
     223    //if(CollectionManager.isSolrCollection()) { 
    224224        command_parts_list.add("-activate"); 
    225     } 
     225        //} 
    226226 
    227227    if(Gatherer.GS3) { 
     
    17631763         
    17641764        else if(installCollection()) { 
    1765             // If we have a local library running then ask it to add our newly create collection 
     1765            // If we have a local library running then ask it to add our newly created collection 
    17661766            if (LocalLibraryServer.isRunning() == true) { 
    17671767                LocalLibraryServer.addCollection(collection.getName()); 
     
    20472047        Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection.getName()); 
    20482048        } 
     2049        /* 
    20492050        File index_dir = new File(getLoadedCollectionIndexDirectoryPath()); 
    20502051        DebugStream.println("Index = " + index_dir.getAbsolutePath()); 
     
    20882089        moveContentsInto(building_dir, index_dir); 
    20892090        } 
     2091 
     2092        // move oai tmpdb to oai livedb 
     2093        */ 
     2094         
    20902095    } 
    20912096    catch (Exception exception) {