Changeset 784

Timestamp:

1999-11-15T18:10:44+13:00 (24 years ago)

Author:

sjboddie

Message:

added -keepold option

Location:

trunk/gsdl

Files:

• bin/script/buildcol.pl (modified) (4 diffs)
• perllib/mgbuilder.pm (modified) (3 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -47 +47 @@
     print STDERR "   -builddir directory   Where to put the built indexes\n";
     print STDERR "   -maxdocs number       Maximum number of documents to build\n";
-    print STDERR "   -debug                print output to STDOUT\n";
+    print STDERR "   -debug                Print output to STDOUT\n";
     print STDERR "   -mode all|compress_text|build_index|infodb\n";
-    print STDERR "   -index indexname      index to build (will build all in config file if not set)\n";
+    print STDERR "   -index indexname      Index to build (will build all in\n"; 
+    print STDERR "                         config file if not set)\n";
+    print STDERR "   -keepold              will not destroy the current contents of the\n";
+    print STDERR "                         building directory\n";
     print STDERR "   -allclassifications   Don't remove empty classifications\n\n";
 }
@@ -57 +60 @@
 {
     my ($verbosity, $archivedir, $cachedir, $builddir, $maxdocs, 
-    $debug, $mode, $indexname, $allclassifications);
+    $debug, $mode, $indexname, $keepold, $allclassifications);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -67 +70 @@
              'mode/^(all|compress_text|build_index|infodb)$/all', \$mode,
              'index/.*/', \$indexname,
+             'keepold', \$keepold,
              'allclassifications', \$allclassifications)) {
     &print_usage();
@@ -145 +149 @@
     eval("\$builder = new $buildertype(\$collection, " .
      "\$realarchivedir, \$realbuilddir, \$verbosity, " .
-     "\$maxdocs, \$debug, \$allclassifications)");
+     "\$maxdocs, \$debug, \$keepold, \$allclassifications)");
     die "$@" if $@;
 

trunk/gsdl/perllib/mgbuilder.pm

@@ -47 +47 @@
 
 sub new {
-    my ($class, $collection, $source_dir, $build_dir, 
-    $verbosity, $maxdocs, $debug, $allclassifications) = @_;
+    my ($class, $collection, $source_dir, $build_dir, $verbosity, 
+    $maxdocs, $debug, $keepold, $allclassifications) = @_;
 
     # create an mgbuilder object
@@ -57 +57 @@
               'maxdocs'=>$maxdocs,
               'debug'=>$debug,
+              'keepold'=>$keepold,
               'allclassifications'=>$allclassifications,
               'notbuilt'=>[]    # indexes not built
@@ -156 +157 @@
     my $self = shift (@_);
 
-    if (!$self->{'debug'}) {
+    if (!$self->{'debug'} && !$self->{'keepold'}) {
     # remove any old builds
     &util::rm_r($self->{'build_dir'});