Changeset 814 for trunk

Timestamp:

1999-12-07T10:50:39+13:00 (24 years ago)

Author:

sjboddie

Message:

plugins now take options

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (2 diffs)
• import.pl (modified) (3 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -66 +66 @@
              'cachedir/.*/', \$cachedir,
              'builddir/.*/', \$builddir,
-             'maxdocs/\d+/', \$maxdocs,
+             'maxdocs/^\-?\d+/-1', \$maxdocs,
              'debug', \$debug,
              'mode/^(all|compress_text|build_index|infodb)$/all', \$mode,
@@ -95 +95 @@
     if (defined $collectcfg->{'builddir'} && $builddir eq "") {
         $builddir = $collectcfg->{'builddir'};
-    }
-    if (defined $collectcfg->{'textindex'}) {
-        $textindex = $collectcfg->{'textindex'};
     }
     } else {

trunk/gsdl/bin/script/import.pl

@@ -73 +73 @@
              'gzip', \$gzip,
              'debug', \$debug,
-             'maxdocs/\d+/', \$maxdocs)) {
+             'maxdocs/^\-?\d+/-1', \$maxdocs)) {
     &print_usage();
     die "\n";
@@ -88 +88 @@
 
     # get the list of plugins for this collection
-    @plugins = ();
+    my $plugins = [];
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc/collect.cfg");
     if (-e $configfilename) {
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-    if (defined $collectcfg->{'plugins'}) {
-        @plugins = @{$collectcfg->{'plugins'}};
+    if (defined $collectcfg->{'plugin'}) {
+        $plugins = $collectcfg->{'plugin'};
     }
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {
@@ -123 +123 @@
 
     # load all the plugins
-    $pluginfo = &plugin::load_plugins ($collection, \@plugins);
+    $pluginfo = &plugin::load_plugins ($plugins);
     if (scalar(@$pluginfo) == 0) {
     print STDERR "No plugins were loaded.\n";