Changeset 32612

Show
Ignore:
Timestamp:
19.11.2018 14:40:48 (4 weeks ago)
Author:
kjdon
Message:

actually, we need to set build_dir to index before hand so we can look for buildConfig.xml there. But only set the buildcol arg if we end up being incremntal

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/incremental-buildcol.pl

    r32611 r32612  
    103103     
    104104    my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode); 
    105  
     105    my $build_dir_defined = 1; 
     106    if (!defined $build_dir) { 
     107    # Yes this is intentional that 'build_dir' points to "index" 
     108    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index"); 
     109    $build_dir_defined = 0; 
     110    } 
    106111    # look for build.cfg/buildConfig.xml 
    107112    my $build_cfg_filename =""; 
     
    143148 
    144149    # if we actually are incremental, then set builddir to index. 
    145     if (!defined $build_dir && $is_incremental) { 
     150    if ( !$build_dir_defined && $is_incremental) { 
    146151    # Yes this is intentional that 'build_dir' points to "index" 
    147152    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");