Changeset 14556

Timestamp:

2007-09-22T16:13:26+12:00 (16 years ago)

Author:

shaoqun

Message:

make it use the plugout defined in the config file first

File:

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

gsdl/trunk/bin/script/import.pl

@@ -395 +395 @@
     }
     }
-     
-    if ($saveas !~ /^(GA|METS)$/) {
-    if (defined $collectcfg->{'plugout'} && $collectcfg->{'plugout'}[0] =~ /^(GAPlugout|METSPlugout)$/) {
-        $saveas = $collectcfg->{'plugout'}[0];
-    } else {
-        $saveas ="GAPlugout";
+
+    my ($plugout); 
+    if (defined $collectcfg->{'plugout'}) {
+    $plugout = $collectcfg->{'plugout'};
+    }
+    else{
+    if ($saveas !~ /^(GA|METS)$/) {
+        push @$plugout,"GAPlugout";
+    }
+    else{
+        push @$plugout,$saveas."Plugout";
     }
     }
@@ -487 +492 @@
 
     ####Use Plugout####
-    my ($plugout_name); 
-    if ($saveas !~ /^(GA|METS)Plugout$/  ){      
-    $plugout_name = $saveas."Plugout";
-    }
-    else {
-    $plugout_name = $saveas;
-    } 
-    
-    my $opts=[];
-    push @$opts,("-output_info",$archive_info) if (defined $archive_info); 
-    
-    push @$opts,("-verbosity",$verbosity) if (defined $verbosity);
-    push @$opts,("-gzip_output") if ($gzip);
-    push @$opts,("-group_size",$groupsize) if (defined $groupsize);
-    push @$opts,("-output_handle",$out) if (defined $out);
-    
-    push @$opts,("-debug") if ($debug);
-    
-    $processor = &plugout::load_plugout($plugout_name,$opts);                        
+    push @$plugout,("-output_info",$archive_info) if (defined $archive_info); 
+    push @$plugout,("-verbosity",$verbosity) if (defined $verbosity);
+    push @$plugout,("-gzip_output") if ($gzip);
+    push @$plugout,("-group_size",$groupsize) if (defined $groupsize);
+    push @$plugout,("-output_handle",$out) if (defined $out);
+    push @$plugout,("-debug") if ($debug);
+    
+    $processor = &plugout::load_plugout($plugout);                        
     $processor->setoutputdir ($archivedir);
     $processor->set_sortmeta ($sortmeta, $removeprefix, $removesuffix) if defined $sortmeta;