Changeset 12335

Timestamp:

2006-07-28T15:05:10+12:00 (18 years ago)

Author:

shaoqun

Message:

now it uses plugouts

File:

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

trunk/gsdl/bin/script/import.pl

@@ -37 +37 @@
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugouts");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify");
 }
@@ -43 +44 @@
 use colcfg;
 use plugin;
+use plugout;
 use docprint;
 use manifest;
@@ -374 +376 @@
     }
     }
+
+     
     if ($saveas !~ /^(GA|METS)$/) {
-    if (defined $collectcfg->{'saveas'} && $collectcfg->{'saveas'} =~ /^(GA|METS)$/) {
-        $saveas = $collectcfg->{'saveas'};
+    if (defined $collectcfg->{'plugout'} && $collectcfg->{'plugout'}[0] =~ /^(GAPlugout|METSPlugout)$/) {
+        $saveas = $collectcfg->{'plugout'}[0];
     } else {
-        $saveas ="GA";
-    }
-    }
+        $saveas ="GAPlugout";
+    }
+    }
+
     if (defined $collectcfg->{'sortmeta'} && (!defined $sortmeta || $sortmeta eq "")) {
     $sortmeta = $collectcfg->{'sortmeta'};
@@ -464 +469 @@
     $archive_info->load_info ($archive_info_filename);
 
+<<<<<<< import.pl
+         ####Use Plugout####
+         my ($plugout_name); 
+        if ($saveas !~ /^(GA|METS)Plugout$/  ){      
+        $plugout_name = $saveas."Plugout";
+    }
+        else{
+            $plugout_name = $saveas;
+          } 
+
+         my $opts=[];
+
+    push @$opts,("-output_info",$export_info) if (defined $export_info); 
+    
+    push @$opts,("-verbosity",$verbosity) if (defined $verbosity);
+    push @$opts,("-gzip_output",$gzip) if (defined $gzip);
+    push @$opts,("-group_size",$groupsize) if (defined $groupsize);
+    push @$opts,("-output_handle",$out) if (defined $out);
+        
+        #$processor = new docsave ($collection, $archive_info, $verbosity, $gzip, $groupsize, $out, $service, $saveas);
+        $processor = &plugout::load_plugout($plugout_name,$opts);                        
+        $processor->setoutputdir ($archivedir);
+        $processor->set_sortmeta ($sortmeta, $removeprefix, $removesuffix) if defined $sortmeta;
+    $processor->set_OIDtype ($OIDtype);
+    #$processor->set_saveas ($saveas);
+    #$processor->set_saveas_version ("greenstone"); 
+=======
     # create a docsave object to process the documents
     $processor = new docsave ($collection, $archive_info, $verbosity, $gzip, $groupsize, $out, $service, $saveas);
@@ -472 +504 @@
     $processor->set_saveas_version ("greenstone");
 
+>>>>>>> 1.78
     } else {
     $processor = new docprint ();
@@ -503 +536 @@
     if (!$debug) {
     $processor->close_file_output() if $groupsize > 1;
+        $processor->close_group_output() if $processor->is_group();
     $archive_info->save_info($archive_info_filename);
     }