Changeset 783

Timestamp:

1999-11-15T17:52:11+13:00 (24 years ago)

Author:

sjboddie

Message:

removed gettext.pl - added debug, mode and index options to buildcol.pl,
added debug option to import.pl

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (5 diffs)
• gettext.pl (deleted)
• import.pl (modified) (6 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 "   -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 "   -allclassifications   Don't remove empty classifications\n\n";
 }
@@ -53 +56 @@
 sub main
 {
+    my ($verbosity, $archivedir, $cachedir, $builddir, $maxdocs, 
+    $debug, $mode, $indexname, $allclassifications);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -59 +64 @@
              'builddir/.*/', \$builddir,
              'maxdocs/\d+/', \$maxdocs,
+             'debug', \$debug,
+             'mode/^(all|compress_text|build_index|infodb)$/all', \$mode,
+             'index/.*/', \$indexname,
              'allclassifications', \$allclassifications)) {
     &print_usage();
@@ -69 +77 @@
     die "\n";
     }
-
-    # only here to prevent a perl warning
-    $maxdocs = "" if $maxdocs !~ /\d/; 
-    $allclassifications = 0 unless $allclassifications == 1;
 
     # read the configuration file
@@ -141 +145 @@
     eval("\$builder = new $buildertype(\$collection, " .
      "\$realarchivedir, \$realbuilddir, \$verbosity, " .
-     "\$maxdocs, \$allclassifications)");
+     "\$maxdocs, \$debug, \$allclassifications)");
     die "$@" if $@;
 
     $builder->init();
-    $builder->compress_text($textindex);
-    $builder->build_indexes();
-    $builder->make_infodatabase();
-    $builder->collect_specific();
-    $builder->make_auxiliary_files();
+
+    if ($mode =~ /^all$/i) {
+    $builder->compress_text($textindex);
+    $builder->build_indexes($indexname);
+    $builder->make_infodatabase();
+    $builder->collect_specific();
+    } elsif ($mode =~ /^compress_text$/i) {
+    $builder->compress_text($textindex);
+    } elsif ($mode =~ /^build_index$/i) {
+    $builder->build_indexes($indexname);    
+    } elsif ($mode =~ /^infodb$/i) {
+    $builder->make_infodatabase();
+    } else {
+    die "unknown mode: $mode\n";
+    }
+
+    $builder->make_auxiliary_files() if !$debug;
     $builder->deinit();
-
-
-    if ($realbuilddir ne $builddir) {
+    
+    if (($realbuilddir ne $builddir) && !$debug) {
     print STDERR "Copying back the cached build\n" if ($verbosity >= 1);
     &util::rm_r ($builddir);

trunk/gsdl/bin/script/import.pl

@@ -40 +40 @@
 use plugin;
 use docsave;
+use docprint;
 use util;
 use parsargv;
@@ -54 +55 @@
     print STDERR "                          directory -- use with care\n";
     print STDERR "   -gzip                  Use gzip to compress resulting gml documents\n";
+    print STDERR "   -debug                 Print imported text to STDOUT\n";
     print STDERR "   -maxdocs number        Maximum number of documents to import\n\n";
 }
@@ -61 +63 @@
 
 sub main {
+    my ($verbosity, $importdir, $archivedir, $keepold, 
+    $removeold, $gzip, $debug, $maxdocs);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -68 +72 @@
              'removeold', \$removeold,
              'gzip', \$gzip,
+             'debug', \$debug,
              'maxdocs/\d+/', \$maxdocs)) {
     &print_usage();
@@ -133 +138 @@
 
     # read the archive information file
-    $archive_info_filename = &util::filename_cat ($archivedir, "archives.inf");
-    $archive_info = new arcinfo ();
-    $archive_info->load_info ($archive_info_filename);
+    if (!$debug) {
+    $archive_info_filename = &util::filename_cat ($archivedir, "archives.inf");
+    $archive_info = new arcinfo ();
+    $archive_info->load_info ($archive_info_filename);
 
-    # create a docsave object to process the documents
-    $processor = new docsave ($collection, $archive_info, $verbosity, $gzip);
-    $processor->setarchivedir ($archivedir);
+    # create a docsave object to process the documents
+    $processor = new docsave ($collection, $archive_info, $verbosity, $gzip);
+    $processor->setarchivedir ($archivedir);
+    } else {
+    $processor = new docprint ();
+    }
 
     # process the import directory
@@ -146 +155 @@
     
     # write out the archive information file
-    $archive_info->save_info($archive_info_filename);
+    if (!$debug) {
+    $archive_info->save_info($archive_info_filename);
+    }
 }