Changeset 32611 for main

Timestamp:

2018-11-19T13:42:05+13:00 (5 years ago)

Author:

kjdon

Message:

only set builddir to index if we actually are being incremental. Otherwise, we set remove old, current contents of index deleted, then try to copy index to index, which no longer exists...

File:

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

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

@@ -92 +92 @@
     exit -1;
     }
-
-    if (!defined $build_dir) {
-    # Yes this is intentional that 'build_dir' points to "index"
-    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");
-    push(@filtered_argv,"-builddir",$build_dir);
-    }
-
-    my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
     
     my $buildcol_cmd = "\"".&util::get_perl_exec()."\" -S buildcol.pl";
@@ -120 +112 @@
     $build_cfg_filename = &util::filename_cat($build_dir, "buildConfig.xml");
     }
-    
+
+    # do we actually want to be incremental?
+    my $is_incremental = 1; 
     if (-e $build_cfg_filename) {
 
@@ -132 +126 @@
         print STDERR "*****\n";
         $buildcol_cmd .= " -removeold";
+        $is_incremental = 0;
     }
     else {
@@ -144 +139 @@
     print STDERR "*****\n";
     $buildcol_cmd .= " -removeold";
+    $is_incremental = 0;
     }
 
-    
+    # if we actually are incremental, then set builddir to index.
+    if (!defined $build_dir && $is_incremental) {
+    # Yes this is intentional that 'build_dir' points to "index"
+    $build_dir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'},"index");
+    push(@filtered_argv,"-builddir",$build_dir);
+    }
+
+    my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
+
     $buildcol_cmd .= " $quoted_argv \"$collection\"";