Changeset 12341

Timestamp:

2006-07-28T16:06:28+12:00 (18 years ago)

Author:

shaoqun

Message:

fixed the bugs

File:

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

trunk/gsdl/bin/script/import.pl

@@ -469 +469 @@
     $archive_info->load_info ($archive_info_filename);
 
-<<<<<<< import.pl
+
          ####Use Plugout####
          my ($plugout_name); 
@@ -481 +481 @@
          my $opts=[];
 
-    push @$opts,("-output_info",$export_info) if (defined $export_info); 
+    push @$opts,("-output_info",$archive_info) if (defined $archive_info); 
     
     push @$opts,("-verbosity",$verbosity) if (defined $verbosity);
@@ -488 +488 @@
     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);
-    $processor->setoutputdir ($archivedir);
-    $processor->set_sortmeta ($sortmeta, $removeprefix, $removesuffix) if defined $sortmeta;
-    $processor->set_OIDtype ($OIDtype, $OIDmetadata);
-    $processor->set_saveas ($saveas);
-    $processor->set_saveas_version ("greenstone");
-
->>>>>>> 1.78
+
+
     } else {
     $processor = new docprint ();