Changeset 32612

Timestamp:

2018-11-19T14:40:48+13:00 (5 years 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

File:

• main/trunk/greenstone2/bin/script/incremental-buildcol.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/incremental-buildcol.pl

@@ -103 +103 @@
     
     my $collectcfg = &colcfg::read_collection_cfg ($collect_cfg_filename,$gs_mode);
-
+    my $build_dir_defined = 1;
+    if (!defined $build_dir) {
+    # Yes this is intentional that 'build_dir' points to "index"
+    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");
+    $build_dir_defined = 0;
+    }
     # look for build.cfg/buildConfig.xml
     my $build_cfg_filename ="";
@@ -143 +148 @@
 
     # if we actually are incremental, then set builddir to index.
-    if (!defined $build_dir && $is_incremental) {
+    if ( !$build_dir_defined && $is_incremental) {
     # Yes this is intentional that 'build_dir' points to "index"
     $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");