Changeset 22639 for main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm

Timestamp:

2010-08-17T11:46:43+12:00 (14 years ago)

Author:

kjdon

Message:

now uses new OOConvertBinaryFile as super class

File:

• main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm

@@ -28 +28 @@
 package ExcelPlugin;
 
-use ConvertBinaryFile;
+use OOConvertBinaryFile;
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
@@ -34 +34 @@
 use gsprintf 'gsprintf';
 
-# @ISA dynamically configured to be either OpenOfficeConverter or ConvertBinaryFile
-
-# do not initialise these variables
-my $openoffice_ext_installed;
-my $openoffice_ext_working;
 sub BEGIN {
-    eval("require OpenOfficeConverter");
-    if ($@) {
-    # Useful debugging statement if there is a syntax error in OpenOfficeConverter  
-    #print STDERR "$@\n";
-    @ExcelPlugin::ISA = ('ConvertBinaryFile');
-    $openoffice_ext_installed = 0;
-    $openoffice_ext_working = 0;
-    }
-    else {
-    # Successfully found
-    $openoffice_ext_installed = 1;
-    # now check whether it can run soffice
-    if ($OpenOfficeConverter::openoffice_conversion_available) {
-        @ExcelPlugin::ISA = ('OpenOfficeConverter');
-        $openoffice_ext_working = 1;
-        
-    } else {
-        @ExcelPlugin::ISA = ('ConvertBinaryFile');
-        $openoffice_ext_working = 0;
-    }
-    }
+    @ExcelPlugin::ISA = ('OOConvertBinaryFile');
 }
 
@@ -70 +45 @@
     'deft' => &get_default_process_exp() }
       ];
-
-my $opt_openoffice_args = 
-    [ { 'name' => "openoffice_scripting",
-    'desc' => "{OpenOfficeConverter.openoffice_scripting}",
-    'type' => "flag",
-    'reqd' => "no" } ];
-
 
 my $options = { 'name'     => "ExcelPlugin",
@@ -90 +58 @@
     push(@$pluginlist, $class);
     
-    if ($openoffice_ext_installed) {
-    print STDERR "ExcelPlugin: OpenOffice Extension to Greenstone detected\n";
-    if ($openoffice_ext_working) {
-        print STDERR "... and it appears to be working\n";
-    } else {
-        print STDERR "... but it appears to be broken\n";
-        &gsprintf(STDERR, "OpenOfficeConverter: {OpenOfficeConverter.noconversionavailable} ({OpenOfficeConverter.$OpenOfficeConverter::no_openoffice_conversion_reason})\n");
-    }
-    }
-
-    if ($openoffice_ext_working) {
-    push(@$arguments,@$opt_openoffice_args);
-    }    
-
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = {};
-
-    if ($openoffice_ext_working) {
-    $self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
-    }
-    else {
-    $self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
-    }
-
+    my $self = new OOConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
+    
     if ($self->{'info_only'}) {
     # don't worry about any options etc
@@ -131 +78 @@
     }
 
-    $self->{'convert_options'} = "-openoffice_scripting" if $self->{'openoffice_scripting'};
-
+    $self = bless $self, $class;
     # set convert_to_plugin and convert_to_ext
-    $self->ConvertBinaryFile::set_standard_convert_settings();
-    print STDERR "final convert-to $self->{'convert_to'}\n";
+    $self->set_standard_convert_settings();
 
     my $secondary_plugin_name = $self->{'convert_to_plugin'};
@@ -151 +96 @@
     push(@$specific_options, "-processing_tmp_files");
     }
-
-    $self = bless $self, $class;
     
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);
-    return bless $self;    
+    return $self;    
 }
+
 
 sub convert_post_process_old