Changeset 2268

Timestamp:

2001-04-03T14:37:44+12:00 (23 years ago)

Author:

davidb

Message:

Augmented so GML files generated conform to XML syntax. Main addition
at the top level is to generate a DTD for the collection once all
the files have been read in.

File:

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

trunk/gsdl/bin/script/import.pl

@@ -48 +48 @@
 
 sub print_usage {
-    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 "\n  usage: $0 [options] collection-name\n\n";
     print STDERR "  options:\n";
     print STDERR "   -verbosity number      0=none, 3=lots\n";
@@ -68 +65 @@
     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";
@@ -80 +75 @@
     $removeold, $gzip, $groupsize, $debug, $maxdocs, $collection,
     $configfilename, $collectcfg, $pluginfo, $sortmeta,
-    $archive_info_filename, $archive_info, $processor, 
-    $out, $collectdir);
+    $archive_info_filename, $archive_info, $processor, $out);
     if (!parsargv::parse(\@ARGV, 
              'verbosity/\d+/2', \$verbosity,
@@ -93 +87 @@
              'debug', \$debug,
              'maxdocs/^\-?\d+/-1', \$maxdocs,
-             'collectdir/.*/', \$collectdir,
              'out/.*/STDERR', \$out)) {
     &print_usage();
@@ -111 +104 @@
 
     # get and check the collection name
-    if (($collection = &util::use_collection(@ARGV, $collectdir)) eq "") {
+    if (($collection = &util::use_collection(@ARGV)) eq "") {
     &print_usage();
     die "\n";
@@ -133 +126 @@
     # 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);
@@ -159 +152 @@
     # fill in the default import and archives directories if none
     # were supplied, turn all \ into / and remove trailing /
-    $importdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
+    $importdir = "$ENV{'GSDLCOLLECTDIR'}/import" if $importdir eq "";
     $importdir =~ s/[\\\/]+/\//g;
     $importdir =~ s/\/$//;
-    $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") if $archivedir eq "";
+    $archivedir = "$ENV{'GSDLCOLLECTDIR'}/archives" if $archivedir eq "";
     $archivedir =~ s/[\\\/]+/\//g;
     $archivedir =~ s/\/$//;
@@ -200 +193 @@
     &plugin::read ($pluginfo, $importdir, "", {}, $processor, $maxdocs);
     
-    &plugin::end($pluginfo, $processor);
+    &plugin::end($pluginfo,$processor);
     
     # write out the archive information file