Changeset 9951

Timestamp:

2005-05-25T17:06:20+12:00 (19 years ago)

Author:

davidb

Message:

import.pl and export.pl share much in common with their abilities to save
documents in different formats (GA, METS, DSpace ...). The code was a bit
repeatative in places and in others not the most consistent. These changes
bring thing in to line more.

Location:

trunk/gsdl/bin/script

Files:

• export.pl (modified) (6 diffs)
• import.pl (modified) (3 diffs)

trunk/gsdl/bin/script/export.pl

@@ -143 +143 @@
     'modegli' => "3" },
       $saveas_argument,
-#      { 'name' => "statsfile",
-#   'desc' => "{export.statsfile}",
-#   'type' => "string",
-#   'deft' => "STDERR",
-#   'reqd' => "no",
-#        'hiddengli' => "yes" },
+      { 'name' => "statsfile",
+    'desc' => "{export.statsfile}",
+    'type' => "string",
+    'deft' => "STDERR",
+    'reqd' => "no",
+        'hiddengli' => "yes" },
       { 'name' => "verbosity",
     'desc' => "{export.verbosity}",
@@ -175 +175 @@
 sub main {
     my ($verbosity, $importdir, $archivedir, $keepold, $listall,
-    $removeold, $saveas, $gzip, $groupsize, $OIDtype, $debug, 
+    $removeold, $saveas, $version,
+    $gzip, $groupsize, $OIDtype, $debug, 
     $maxdocs, $collection, $configfilename, 
-    $pluginfo, $sortmeta, $export_info_filename, 
+    $pluginfo, $sortmeta, 
+    $export_info_filename, $statsfile,
     $export_info, $processor, $out, $faillog, $collectdir, $gli);
 
@@ -195 +197 @@
              'keepold', \$keepold, 
              'removeold', \$removeold, 
-             'saveas/^(DSpace|METS)$/METS', \$saveas,
+             'saveas/^(DSpace|METS|GA)$/METS', \$saveas,
+             'version/.*/', \$version,
              'debug', \$debug,
              'maxdocs/^\-?\d+/', \$maxdocs,
              'collectdir/.*/', \$collectdir,
              'out/.*/STDERR', \$out,
-#            'statsfile/.*/STDERR', \$statsfile,
+             'statsfile/.*/STDERR', \$statsfile,
              'faillog/.*/', \$faillog,
              'gli', \$gli,
@@ -415 +418 @@
         $processor->set_OIDtype ($OIDtype);
         $processor->set_saveas ($saveas);
+        $processor->set_saveas_version ($version);
         } else {
         $processor = new docprint ();
@@ -434 +438 @@
         }
         
-#    # write out export stats
-#    my $close_stats = 0;
-#    if ($statsfile !~ /^(STDERR|STDOUT)$/i) {
-#   if (open (STATS, ">$statsfile")) {
-#       $statsfile = 'import::STATS';
-#       $close_stats = 1;
-#   } else {
-#       &gsprintf($out, "{import.cannot_open_stats_file}", $statsfile);
-#       &gsprintf($out, "{import.stats_backup}\n");
-#       $statsfile = 'STDERR';
-#   }
-#    }
+        # write out export stats
+        my $close_stats = 0;
+        if ($statsfile !~ /^(STDERR|STDOUT)$/i) {
+        if (open (STATS, ">$statsfile")) {
+            $statsfile = 'import::STATS';
+            $close_stats = 1;
+        } else {
+            &gsprintf($out, "{import.cannot_open_stats_file}", $statsfile);
+            &gsprintf($out, "{import.stats_backup}\n");
+            $statsfile = 'STDERR';
+        }
+        }
+
+        &gsprintf($out, "\n");
+        &gsprintf($out, "*********************************************\n");
+
+        &plugin::write_stats($pluginfo, $statsfile, $faillogname, $gli);
+        if ($close_stats) {
+        close STATS;
+        }
+
+        &gsprintf($out, "*********************************************\n");
+
+        close OUT if $close_out;
+
         close FAILLOG;
     };
+
+    if ($@) {
+        print STDERR $@;
+    }
 
 ##  $ENV{'GSDLCOLLECTION'} = undef;
@@ -457 +478 @@
     &gsprintf($out, "\n");
     &gsprintf($out, "*********************************************\n");
-    &gsprintf($out, "{export.complete}\n");
-    &gsprintf($out, "*********************************************\n");
-    
-#    &plugin::write_stats($pluginfo, $statsfile, $faillogname, $gli);
-#    if ($close_stats) {
-#   close STATS;
-#    }
-
-    close OUT if $close_out;
-
+    &gsprintf($out, "* {export.complete}\n");
+    &gsprintf($out, "*********************************************\n");    
 
 }

trunk/gsdl/bin/script/import.pl

@@ -201 +201 @@
 sub main {
     my ($verbosity, $importdir, $archivedir, $keepold, 
-    $removeold, $saveas, $gzip, $groupsize, $OIDtype, $debug, 
+    $removeold, $saveas, $version,
+    $gzip, $groupsize, $OIDtype, $debug, 
     $maxdocs, $collection, $configfilename, $collectcfg, 
     $pluginfo, $sortmeta, $removeprefix, $removesuffix, 
@@ -221 +222 @@
              'keepold', \$keepold, 
              'removeold', \$removeold, 
-             'saveas/^(GA|METS)$/', \$saveas,
+             'saveas/^(GA|METS|DSpace)$/GA', \$saveas,
+             'version/.*/', \$version,
              'gzip', \$gzip, 
              'groupsize/\d+/1', \$groupsize, 
@@ -433 +435 @@
     $processor->set_OIDtype ($OIDtype);
     $processor->set_saveas ($saveas);
+    $processor->set_saveas_version ($version);
+
     } else {
     $processor = new docprint ();