Changeset 13067

Timestamp:

2006-10-10T15:25:35+13:00 (18 years ago)

Author:

kjdon

Message:

if we are appending, and a lucene collection, then set builddir to be index dir, not building dir

File:

• trunk/gsdl/bin/script/build (modified) (4 diffs)

trunk/gsdl/bin/script/build

@@ -394 +394 @@
     if ($append) {
     $import_cmd .= " -keepold";
+    if (not $manifest) {
+        # if we are appending, with no manifest, assume incremental
+        $import_cmd .= " -incremental";
+    }
     } else {
     $import_cmd .= " -removeold";
@@ -431 +435 @@
     if ($append) {
     if ($indextype eq "lucene") {
-        $build_cmd .= " -keepold";
+        $build_cmd .= " -keepold -incremental -builddir $indexdir";
         $removeold = 0;
     }
@@ -449 +453 @@
     &append_file ($out, "$outfile.build");
 
-    if (-e &util::filename_cat ($buildingdir, "text", "$collection.ldb") ||
-    -e &util::filename_cat ($buildingdir, "text", "$collection.bdb")) {
+    if (($removeold && (-e &util::filename_cat ($buildingdir, "text", "$collection.ldb") || -e &util::filename_cat ($buildingdir, "text", "$collection.bdb"))) ||
+    ($removeold == 0 && (-e &util::filename_cat ($indexdir, "text", "$collection.ldb") || -e &util::filename_cat ($indexdir, "text", "$collection.bdb")))) {
     print $out "$collection collection built successfully\n\n";
     if ($remove_archives) {
@@ -474 +478 @@
     }
     else {
-    # Do nothing.  Assume index is symbolic link to building
-    }
-
-    # remove the cached arhives
+    # Do nothing. We have built into index dir rather than building dir
+    }
+
+    # remove the cached archives
     if ($save_archives && -d "${archivedir}.org") {
     &util::rm_r ("${archivedir}.org");