Changeset 22640 for main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm

Timestamp:

2010-08-17T11:55:39+12:00 (14 years ago)

Author:

kjdon

Message:

now uses new OOConvertBInaryFile super class

File:

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

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

@@ -28 +28 @@
 package PowerPointPlugin;
 
-use ConvertBinaryFile;
+use OOConvertBinaryFile;
 
 use strict;
@@ -35 +35 @@
 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";
-    @PowerPointPlugin::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) {
-        @PowerPointPlugin::ISA = ('OpenOfficeConverter');
-        $openoffice_ext_working = 1;
-        
-    } else {
-        @PowerPointPlugin::ISA = ('ConvertBinaryFile');
-        $openoffice_ext_working = 0;
-    }
-    }
+    @PowerPointPlugin::ISA = ('OOConvertBinaryFile');
 }
 
@@ -100 +75 @@
       ];
 
-my $opt_openoffice_args = 
-    [ { 'name' => "openoffice_scripting",
-    'desc' => "{OpenOfficeConverter.openoffice_scripting}",
-    'type' => "flag",
-    'reqd' => "no" } ];
-
 my $options = { 'name'     => "PowerPointPlugin",
         'desc'     => "{PowerPointPlugin.desc}",
@@ -118 +87 @@
     push(@$pluginlist, $class);
 
-    if ($openoffice_ext_installed) {
-    print STDERR "PowerPointPlugin: 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 ($ENV{'GSDLOS'} =~ m/^windows$/i) {
     push(@$arguments,@$opt_windows_args);
     }
-    if ($openoffice_ext_working) {
-    push(@$arguments,@$opt_openoffice_args);
-    }    
 
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
@@ -139 +95 @@
 
 
-    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'}) {
@@ -176 +125 @@
     #these are passed through to gsConvert.pl by ConvertBinaryFile.pm
     $self->{'convert_options'} = "-windows_scripting" if $self->{'windows_scripting'};
-    $self->{'convert_options'} = "-openoffice_scripting" if $self->{'openoffice_scripting'};
 
     # set convert_to_plugin and convert_to_ext
-    $self->ConvertBinaryFile::set_standard_convert_settings();
+    $self->set_standard_convert_settings();
 
     my $secondary_plugin_name = $self->{'convert_to_plugin'};