Changeset 22504

Show
Ignore:
Timestamp:
26.07.2010 13:02:50 (9 years ago)
Author:
kjdon
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

    r22427 r22504  
    162162    } 
    163163    } elsif ($classPluginName eq "WordPlugin") { 
    164     if ($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) { 
     164    if (($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) || defined $self->{'openoffice_scripting'}) { 
    165165        # we use structured HTML, not normal html 
    166166        $convert_to_type = "structuredhtml"; 
     
    198198    $self->{'convert_to_ext'} = $convert_to_ext; 
    199199    } 
    200  
     200     
    201201    return bless $self, $class; 
    202202}