Changeset 12003 for trunk/gsdl/bin/script/build

Timestamp:

2006-07-04T15:36:20+12:00 (18 years ago)

Author:

davidb

Message:

Scripts upgraded to perform more efficiently with incremental addition.

File:

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

trunk/gsdl/bin/script/build

@@ -155 +155 @@
     print STDOUT "   -optionfile file        Get options from file, useful on systems where\n";
     print STDOUT "                           long command lines may cause problems\n";
+    print STDOUT "   -indextype mg|mgpp|lucene \n";
+    print STDERR "                           Specify the type of indexer used in this collection\n";
+    print STDERR "                           If -append is used then -indextype is needed to \n";
+    print STDERR "                           determine how to run buildcol.pl as well as update\n";
+    print STDERR "                           'building' and 'index' according.\n";
     print STDOUT "   -append                 Add new files to existing collection\n";
+    print STDOUT "   -manifest               Use manifest.xml file to determine which files to process.\n";
     print STDOUT "   -remove_archives        Remove archives directory after successfully\n";
     print STDOUT "                           building the collection.\n";
@@ -386 +392 @@
     my $import_cmd = "perl -S import.pl";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
-    $import_cmd .= " -removeold" unless $append;
+    if ($append) {
+    $import_cmd .= " -keepold";
+    } else {
+    $import_cmd .= " -removeold";
+    }
+
+    $import_cmd .= " -manifest manifest.xml" if ($manifest);
     $import_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
     $import_cmd .= " -statsfile \"$statsfile\"" if $statsfile =~ /\w/;
@@ -415 +427 @@
 
     my $build_cmd = "perl -S buildcol.pl";
+
+    my $removeold = 1;
+    if ($append) {
+    if ($indextype eq "lucene") {
+        $build_cmd .= " -keepold";
+        $removeold = 0;
+    }
+    else {
+        $build_cmd .= " -removeold";
+    }
+    }
+    else {
+    $build_cmd .= " -removeold";
+    }
+
     $build_cmd .= " -out \"$outfile.build\"" if $use_out;
     $build_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
@@ -437 +464 @@
     }
 
-    # replace old indexes with new ones
-    if (&has_content ($indexdir)) {
-    print $out "removing old indexes\n";
-    &util::rm_r ($indexdir);
-    }
-    rmdir ($indexdir) if -d $indexdir;
-    &File::Copy::move ($buildingdir, $indexdir);
+    if ($removeold) {
+    # replace old indexes with new ones
+    if (&has_content ($indexdir)) {
+        print $out "removing old indexes\n";
+        &util::rm_r ($indexdir);
+    }
+    rmdir ($indexdir) if -d $indexdir;
+    &File::Copy::move ($buildingdir, $indexdir);
+    }
+    else {
+    # Do nothing.  Assume index is symbolic link to building
+    }
 
     # remove the cached arhives
@@ -560 +592 @@
     if (!parsargv::parse($argref, 
              'optionfile/.*/', \$optionfile,
+             'indextype/^(mg|mgpp|lucene)$/mg', \$indextype,
              'append', \$append,
+             'manifest', \$manifest,
              'remove_archives', \$remove_archives,
              'remove_import', \$remove_import,