Changeset 10464

Timestamp:

2005-08-10T15:37:08+12:00 (19 years ago)

Author:

chi

Message:

Modifications of the if loop condition in convertPPT() to allow the different
types of convert_to can be dealt with properly.

File:

• trunk/gsdl/bin/script/gsConvert.pl (modified) (6 diffs)

trunk/gsdl/bin/script/gsConvert.pl

@@ -260 +260 @@
     
     my $success = 0;
-    
+  
     # Attempt simple conversion to HTML
     if (!$output_type || ($output_type =~ /html/i)) {
@@ -340 +340 @@
 
     my $ppt_convert_type = "";
-    if (!$output_type || $windows_scripting ||($output_type !~ /html/i)){
+    #if (!$output_type || $windows_scripting ||($output_type !~ /html/i) ||($output_type !~ /text/i)){
+    if ($windows_scripting && ($output_type !~ /html/i) && ($output_type !~ /text/i)){
     if ($output_type =~ /gif/i) {
         $ppt_convert_type = "-g";
@@ -368 +369 @@
         }
     }
-    } else {
+    } elsif (!$output_type || ($output_type =~ /html/i)) {
     # Attempt conversion to HTML
     #if (!$output_type || ($output_type =~ /html/i)) {
@@ -386 +387 @@
         return "html";
     }
-    }
+    } 
 
     $success = &any_to_text($input_filename, $output_filestem);
@@ -392 +393 @@
     return "text";
     }
-
+    
     return "fail";
 }
@@ -1168 +1169 @@
       return 0;
     }
-
+    
     open(IN, "<$input_filename") || return 0;
     binmode(IN);