Changeset 2287

Timestamp:

2001-04-05T22:30:39+12:00 (23 years ago)

Author:

sjboddie

Message:

Reverted import.pl to version 1.25 as the last commit wiped out some of
the more recent changes. There didn't appear to be any new changes in the
now defunct version 1.26 so I'm guessing it was just a mistake. My sincere
apologies to David if I've screwed something up (but he started it ;-)

File:

• trunk/gsdl/bin/script/import.pl (modified) (8 diffs)

trunk/gsdl/bin/script/import.pl

@@ -48 +48 @@
 
 sub print_usage {
-    print STDERR "\n  usage: $0 [options] collection-name\n\n";
+    print STDERR "\n";
+    print STDERR "import.pl: Converts documents in collections -importdir directory into\n";
+    print STDERR "           gml documents which are written to the -archivedir directory.\n\n";
+    print STDERR "  usage: $0 [options] collection-name\n\n";
     print STDERR "  options:\n";
     print STDERR "   -verbosity number      0=none, 3=lots\n";
@@ -65 +68 @@
     print STDERR "                          building. This will be disabled if groupsize > 1\n";
     print STDERR "   -debug                 Print imported text to STDOUT\n";
+    print STDERR "   -collectdir directory  Collection directory (defaults to " .
+    &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
     print STDERR "   -out                   Filename or handle to print output status to.\n";
     print STDERR "                          The default is STDERR\n\n";
@@ -75 +80 @@
     $removeold, $gzip, $groupsize, $debug, $maxdocs, $collection,
     $configfilename, $collectcfg, $pluginfo, $sortmeta,
-    $archive_info_filename, $archive_info, $processor, $out);
+    $archive_info_filename, $archive_info, $processor, 
+    $out, $collectdir);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -87 +93 @@
              'debug', \$debug,
              'maxdocs/^\-?\d+/-1', \$maxdocs,
+             'collectdir/.*/', \$collectdir,
              'out/.*/STDERR', \$out)) {
     &print_usage();
@@ -104 +111 @@
 
     # get and check the collection name
-    if (($collection = &util::use_collection(@ARGV)) eq "") {
+    if (($collection = &util::use_collection(@ARGV, $collectdir)) eq "") {
     &print_usage();
     die "\n";
@@ -126 +133 @@
     # get the list of plugins for this collection
     my $plugins = [];
-    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc/collect.cfg");
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     if (-e $configfilename) {
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
@@ -152 +159 @@
     # fill in the default import and archives directories if none
     # were supplied, turn all \ into / and remove trailing /
-    $importdir = "$ENV{'GSDLCOLLECTDIR'}/import" if $importdir eq "";
+    $importdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
     $importdir =~ s/[\\\/]+/\//g;
     $importdir =~ s/\/$//;
-    $archivedir = "$ENV{'GSDLCOLLECTDIR'}/archives" if $archivedir eq "";
+    $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") if $archivedir eq "";
     $archivedir =~ s/[\\\/]+/\//g;
     $archivedir =~ s/\/$//;
@@ -193 +200 @@
     &plugin::read ($pluginfo, $importdir, "", {}, $processor, $maxdocs);
     
-    &plugin::end($pluginfo,$processor);
+    &plugin::end($pluginfo, $processor);
     
     # write out the archive information file