Changeset 22611

Timestamp:

2010-08-12T15:58:39+12:00 (14 years ago)

Author:

kjdon

Message:

now uses OpenOfficeConverter that is not ConvertBinaryFile

File:

• main/trunk/greenstone2/perllib/plugins/WordPlugin.pm (modified) (8 diffs)

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

@@ -42 +42 @@
     if ($@) {
     # Useful debugging statement if there is a syntax error in OpenOfficeConverter:
-    #print STDERR "$@\n";
-    @WordPlugin::ISA = ('ConvertBinaryFile');
+    print STDERR "$@\n";
+    #@WordPlugin::ISA = ('ConvertBinaryFile');
     $openoffice_ext_installed = 0;
     $openoffice_ext_working = 0;
@@ -52 +52 @@
     # now check whether it can run soffice
     if ($OpenOfficeConverter::openoffice_conversion_available) {
-        @WordPlugin::ISA = ('OpenOfficeConverter');
+        #@WordPlugin::ISA = ('OpenOfficeConverter');
         $openoffice_ext_working = 1;
         
     } else {
-        @WordPlugin::ISA = ('ConvertBinaryFile');
+        #@WordPlugin::ISA = ('ConvertBinaryFile');
         $openoffice_ext_working = 0;
     }
+    }
+
+    if ($openoffice_ext_working) {
+    @WordPlugin::ISA = ('ConvertBinaryFile', 'OpenOfficeConverter');
+    } else {
+    @WordPlugin::ISA = ('ConvertBinaryFile');
     }
 }
@@ -160 +166 @@
 
     my $self = {};
-
     if ($openoffice_ext_working) {
     
-    $self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
+    #$self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
+    my $ooc_self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
+    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
+    $self = BasePlugin::merge_inheritance($ooc_self, $cbf_self);
     }
     else {
     $self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
-    }
+   }
 
     if ($self->{'info_only'}) {
@@ -203 +211 @@
     } 
 
+    $self = bless $self, $class;
+    # if we use the merge inheritance above, need to bless self before calling a method.
     # 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'};
@@ -253 +263 @@
     }
 
-    $self = bless $self, $class;
+    #$self = bless $self, $class;
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);
 
@@ -264 +274 @@
     
     $self->SUPER::init($verbosity,$outhandle,$failhandle);
+    if ($openoffice_ext_working) {
+    $self->OpenOfficeConverter::init();
+    }
 }
 
@@ -270 +283 @@
     my ($self) = @_;
     
+    if ($openoffice_ext_working) {
+    $self->OpenOfficeConverter::deinit();
+    }
     $self->SUPER::deinit();
 }
@@ -281 +297 @@
 }
 
+# if we are using open office, we use OpenOfficeConverter's convert method, otherwise fall back to ConvertBinaryFile method.
+sub tmp_area_convert_file {
+    my $self = shift (@_);
+    my ($output_ext, $input_filename, $textref) = @_;
+
+    if ($openoffice_ext_working && $self->{'openoffice_scripting'}) {
+    my ($result, $result_str, $new_filename) = $self->OpenOfficeConverter::convert($input_filename, $output_ext);
+    if ($result != 0) {
+        return $new_filename;
+    }
+    my $outhandle=$self->{'outhandle'};
+    print $outhandle "Open Office Conversion error\n";
+    print $outhandle $result_str;
+    return "";
+    }
+    else {
+    return $self->ConvertBinaryFile::tmp_area_convert_file(@_);
+    }
+}
 sub convert_post_process_old
 {