Changeset 22507 for main/trunk

Timestamp:

2010-07-26T15:43:40+12:00 (14 years ago)

Author:

kjdon

Message:

some moving around and tidying up of code

File:

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

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

@@ -30 +30 @@
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
-
+no strict 'subs';
+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";
+    @WordPlugin::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) {
+        @WordPlugin::ISA = ('OpenOfficeConverter');
+        $openoffice_ext_working = 1;
+        
+    } else {
+        @WordPlugin::ISA = ('ConvertBinaryFile');
+        $openoffice_ext_working = 0;
+    }
+    }
+}
 
 my $arguments =
@@ -104 +132 @@
     push(@$pluginlist, $class);
 
-    my $openoffice_ext_installed;
-    eval("require OpenOfficeConverter");
-    if ($@) {
-    # Useful debugging statement if there is a syntax error in OpenOfficeConverter  
-     #print STDERR "$@\n";
-
-    push(@WordPlugin::ISA,"ConvertBinaryFile");
-    $openoffice_ext_installed = 0;
-    }
-    else {
-    # Successfully found
+    if ($openoffice_ext_installed) {
     print STDERR "WordPlugin: OpenOffice Extension to Greenstone detected\n";
-    push(@WordPlugin::ISA,"OpenOfficeConverter");
-    $openoffice_ext_installed = 1;
-    }
-
+    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");
+    }
+    }
+    
+    my $office_capable = 0;
     if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
     push(@$arguments,@$opt_windows_args);
+    $office_capable = 1;
+    }
+    if ($openoffice_ext_working) {
+    push(@$arguments,@$opt_openoffice_args);
+    $office_capable = 1;
+    }
+    # these office args apply to windows scripting or to openoffice scripting
+    if ($office_capable) {
     push(@$arguments,@$opt_office_args);
     }
-    elsif ($openoffice_ext_installed) {
-    push(@$arguments,@$opt_openoffice_args);
-    push(@$arguments,@$opt_office_args);
-    }
-
+    
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     push(@{$hashArgOptLists->{"OptList"}},$options);
@@ -135 +162 @@
     my $outhandle;
 
-    if ($openoffice_ext_installed) {
+    if ($openoffice_ext_working) {
+    
     $self = new OpenOfficeConverter($pluginlist, $inputargs, $hashArgOptLists);
     $outhandle = $self->{'outhandle'};
 
-    if ($self->{'openoffice_conversion_available'}) {
-        print $outhandle "WordPlugin: OpenOffice scripting functionality available\n";
-
-        # Override default process expression
-        $self->{'process_exp'} = q^(?i)\.(doc|dot|docx|odt)$^;
-
-        if ($self->{'openoffice_scripting'}) {
-        print $outhandle "WordPlugin: Activating OpenOffice scripting functionality\n";
-        }
-    }
-    else {
-        print $outhandle "WordPlugin: Unable to run 'soffice'\n";
-        print $outhandle "WordPlugin: Defaulting to ConvertBinaryFile inheritence\n";
-    }
     }
     else {
@@ -266 +280 @@
 sub get_default_process_exp {
     my $self = shift (@_);
-
+    if ($openoffice_ext_working) {
+    return q^(?i)\.(doc|dot|docx|odt)$^;
+    }
     return q^(?i)\.(doc|dot)$^;
 }