Ignore:
Timestamp:
06/30/16 18:46:47 (5 years ago)
Author:
ak19
Message:
  1. activate.pl modified to allow incremental-building with a manifest file. 2. servercontrol.pm modified to allow activating a collection when the gs3-server is set to use another servlet. The halftone-library servlet returns the ping succeeded message nested in a different element than the default library servlet. So the code's no longer getting the element first. Saves extra effort in the code anyway to do one regex instead of 3.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/activate.pl

    r30527 r30596  
    235235    # Except if we're (doing incremental) building for solr, where we want to still
    236236    # activate and deactivate collections including for the incremental case
    237     if(!&FileUtils::directoryExists($build_dir)) {
    238     $gsserver->print_msg("No building folder at $build_dir to move to index.\n");
    239     exit -1 unless ($buildtype eq "solr"); #&& $incremental);
    240     } elsif (&FileUtils::isDirectoryEmpty($build_dir)) {
    241     $gsserver->print_msg("Nothing in building folder $build_dir to move into index folder.\n");
    242     exit -1 unless ($buildtype eq "solr"); #&& $incremental);
    243     }
    244    
     237
     238    if(!$incremental) { # if (!($incremental && ($build_dir eq $index_dir)))
     239   
     240    if(!&FileUtils::directoryExists($build_dir)) {
     241        $gsserver->print_msg("No building folder at $build_dir to move to index.\n");
     242        exit -1 unless ($buildtype eq "solr"); #&& $incremental);
     243    } elsif (&FileUtils::isDirectoryEmpty($build_dir)) {
     244        $gsserver->print_msg("Nothing in building folder $build_dir to move into index folder.\n");
     245        exit -1 unless ($buildtype eq "solr"); #&& $incremental);
     246    }
     247    }
     248
    245249    # Now the logic in GLI's CollectionManager.java (processComplete()
    246250    # and installCollection()) and Gatherer.configGS3Server().
Note: See TracChangeset for help on using the changeset viewer.