Changeset 22504

Timestamp:

2010-07-26T13:02:50+12:00 (14 years ago)

Author:

kjdon

Message:

for WordPLugin, if openoffice_scripting is set, need to use structuredhtml plugin

File:

• main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm (modified) (2 diffs)

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

@@ -162 +162 @@
     }
     } elsif ($classPluginName eq "WordPlugin") {
-    if ($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) {
+    if (($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) || defined $self->{'openoffice_scripting'}) {
         # we use structured HTML, not normal html
         $convert_to_type = "structuredhtml";
@@ -198 +198 @@
     $self->{'convert_to_ext'} = $convert_to_ext;
     }
-
+    
     return bless $self, $class;
 }