Changeset 17142 for gsdl/trunk/bin/script/import.pl

Timestamp:

2008-09-04T14:27:27+12:00 (16 years ago)

Author:

kjdon

Message:

tidied up import and export scripts a little. Reordered code to make them more similar in preparation for merging the scripts later. import only supports GA and GreenstoneMETS, export only supports Greenstone/FedoraMETS, DSpace, MARCXML. export.pl now only exports one collection at a time. And I have removed some options that didn't make sense - sortmeta, groupsize.

File:

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

gsdl/trunk/bin/script/import.pl

@@ -253 +253 @@
     'modegli' => "4" },
       { 'name' => "gli",
-    'desc' => "",
+    'desc' => "{scripts.gli}",
     'type' => "flag",
     'reqd' => "no",
@@ -273 +273 @@
     # params
     my ($language, $verbosity, $debug,
-    $importdir, $site, $manifest, $incremental, $keepold, 
-    $removeold, $saveas,
+    $collectdir, $importdir, $archivedir, $site, $manifest, 
+    $incremental, $keepold, $removeold, 
+    $saveas,
     $OIDtype, $OIDmetadata, 
     $maxdocs, $statsfile,
-    $out, $faillog, $collectdir, $gli,
-
-    $archivedir, 
+    $out, $faillog, $gli,
     $gzip, $groupsize, 
-    $sortmeta, $reversesort, $removeprefix, $removesuffix, 
+    $sortmeta, $reversesort, $removeprefix, $removesuffix 
     );
 
@@ -287 +286 @@
 
     # other vars
-    my ($configfilename, $collectcfg, $collection, 
+    my ($configfilename, $collection, $collectcfg, 
     $archive_info_filename, $archive_info, 
     $gs_mode,
@@ -331 +330 @@
     if ($intArgLeftinAfterParsing != 1 || (@ARGV && $ARGV[0] =~ /^\-+h/))
     {
-    &PrintUsage::print_txt_usage($options, "{buildcol.params}");
+    &PrintUsage::print_txt_usage($options, "{import.params}");
     die "\n";
     }
@@ -432 +431 @@
     }
 
-    if ($OIDtype !~ /^(hash|incremental|assigned|dirname)$/) {
+    if (!defined $OIDtype || ($OIDtype !~ /^(hash|incremental|assigned|dirname)$/ )) {
     if (defined $collectcfg->{'OIDtype'} && $collectcfg->{'OIDtype'} =~ /^(hash|incremental|assigned|dirname)$/) {
         $OIDtype = $collectcfg->{'OIDtype'};
     } else {
         $OIDtype = "hash"; # the default
-    }
-    }
-
-    my ($plugout); 
-    if (defined $collectcfg->{'plugout'}) {
-    $plugout = $collectcfg->{'plugout'};
-    }
-    else{
-    if ($saveas !~ /^(GA|.*METS|DSpace|MARCXML)$/) {
-        push @$plugout,"GAPlugout";
-    }
-    else{
-        push @$plugout,$saveas."Plugout";
     }
     }
@@ -484 +470 @@
     $gli = 1;
     }
-    
-    
-    # global plugin stuff
-    if (defined $collectcfg->{'separate_cjk'} && $collectcfg->{'separate_cjk'} =~ /^true$/i) {
-    push @global_opts, "-separate_cjk";
-    }
-    
+    $gli = 0 unless defined $gli;
+       
     # check keepold and removeold
     ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "archives", $collectcfg);
  
-    $gli = 0 unless defined $gli;
 
     print STDERR "<Import>\n" if $gli;
@@ -538 +518 @@
 
     # read the archive information file
-
-    # If saveas=DSpace, a "contents" file will be created, otherwise "archives.inf"
-    
-    # the plugouts should be doing this!!
-    if ($saveas eq "DSpace"){
-    $archive_info_filename = &util::filename_cat ($archivedir, "contents");
-    } elsif ($saveas =~ m/^.*METS$/ || $saveas eq "GA" || $saveas eq "MARC" ) {
-    $archive_info_filename = &util::filename_cat ($archivedir, "archives.inf");
-    }
-
+    $archive_info_filename = &util::filename_cat ($archivedir, "archives.inf");
+    
     $archive_info = new arcinfo ();
     $archive_info->load_info ($archive_info_filename);
@@ -555 +527 @@
 
     ####Use Plugout####
+    my ($plugout); 
+    if (defined $collectcfg->{'plugout'} && $collectcfg->{'plugout'} =~ /^(GA|GreenstoneMETS)Plugout/) {
+    $plugout = $collectcfg->{'plugout'};
+    }
+    else{
+    if ($saveas !~ /^(GA|GreenstoneMETS)$/) {
+        push @$plugout,"GAPlugout";
+    }
+    else{
+        push @$plugout,$saveas."Plugout";
+    }
+    }
+
     push @$plugout,("-output_info",$archive_info) if (defined $archive_info); 
     push @$plugout,("-verbosity",$verbosity) if (defined $verbosity);
@@ -590 +575 @@
     }
     }
-
-    if ($saveas eq "FedoraMETS")
-    {
-    # This would be better (should?!) be done in Plugout!!
-
-    # create collection "doc obj" for Fedora that contains
-    # collection-level metadata
-    
-    my $doc_obj = new doc($configfilename,"nonindexed_doc");
-    $doc_obj->set_OID("collection");
-    
-    my $col_name = undef;
-    my $col_meta = $collectcfg->{'collectionmeta'};
-    if (defined $col_meta)
-    {
-        store_collectionmeta($col_meta,"collectionname",$doc_obj);
-        store_collectionmeta($col_meta,"collectioextra",$doc_obj);
-        
-    }
-    
-    $processor->process($doc_obj);
-    }
-
 
     &plugin::end($pluginfo, $processor);