Changeset 11833

Timestamp:

2006-05-18T12:00:19+12:00 (18 years ago)

Author:

kjdon

Message:

the test for windows scripting now tests if its true, rather than defined

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -153 +153 @@
     }
     my $windows_scripting = $self->{'windows_scripting'};
+    $windows_scripting = 0 unless defined $windows_scripting;
     if ($classPluginName eq "PDFPlug") {
     if ($convert_to_type eq "text" && 
@@ -160 +161 @@
     }
     } elsif ($classPluginName eq "WordPlug") {
-    if (defined $self->{'windows_scripting'} && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) {
+    if ($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) {
         # we use structured HTML, not normal html
         $convert_to_type = "structuredhtml";
     } 
     } elsif ($classPluginName eq "PPTPlug") {
-    if (defined $self->{'windows_scripting'} && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type eq "auto") {
+    if ($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type eq "auto") {
         # we use paged img
         $convert_to_type = "pagedimg_jpg";