Changeset 10503

Timestamp:

2005-08-12T12:23:59+12:00 (19 years ago)

Author:

kjdon

Message:

added some handling of auto convert to type when windows scripting is on

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -146 +146 @@
     
     
-    if ($classPluginName eq "PDFPlug" && $strConvertTo eq "text" && 
-    $ENV{'GSDLOS'} =~ /^windows$/i) {
-    print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
-    $strConvertTo = "html";
-    } elsif ($classPluginName eq "WordPlug" && $blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i) {
-    # we use structured HTML
-    $strConvertTo = "structuredhtml";
-    } elsif ($strConvertTo eq "auto") {
+    if ($classPluginName eq "PDFPlug") {
+    if ($strConvertTo eq "text" && 
+        $ENV{'GSDLOS'} =~ /^windows$/i) {
+        print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
+        $strConvertTo = "html";
+    }
+    } elsif ($classPluginName eq "WordPlug") {
+    if ($blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i && $strConvertTo =~ /^(html|auto)$/) {
+        # we use structured HTML, not normal html
+        $strConvertTo = "structuredhtml";
+    } 
+    }
+    elsif ($classPluginName eq "PPTPlug") {
+    if ($blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i && $strConvertTo eq "auto") {
+        # we use paged img
+        $strConvertTo = "pagedimg_jpg";
+    } 
+    }
+    elsif ($strConvertTo eq "auto") {
     # choose html for now - should choose a format based on doc type
     $strConvertTo = "html";