Changeset 22882 for main

Timestamp:

2010-09-08T13:14:47+12:00 (14 years ago)

Author:

kjdon

Message:

set up convert_to list for the case when windows_scripting and openoffice_conversion are both available

File:

• main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm (modified) (3 diffs)

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

@@ -52 +52 @@
     'desc' => "{ConvertBinaryFile.convert_to.text}" },
       { 'name' => "pagedimg_jpg",
-    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_jpg}" },
+    'desc' => "{PowerPointPlugin.convert_to.pagedimg_jpg}" },
       { 'name' => "pagedimg_gif",
-    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_gif}" },
+    'desc' => "{PowerPointPlugin.convert_to.pagedimg_gif}" },
       { 'name' => "pagedimg_png",
-    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_png}" }
+    'desc' => "{PowerPointPlugin.convert_to.pagedimg_png}" }
       ];
 
@@ -66 +66 @@
       { 'name' => "text",
     'desc' => "{ConvertBinaryFile.convert_to.text}" },
+      { 'name' => "pagedimg",
+    'desc' => "{PowerPointPlugin.convert_to.pagedimg}" }
+      ];
+
+my $openoffice_extra_convert_to_list = 
+    [ { 'name' => "html_multi",
+    'desc' => "{PowerPointPlugin.convert_to.html_multi}" },
       { 'name' => "pagedimg",
     'desc' => "{PowerPointPlugin.convert_to.pagedimg}" }
@@ -119 +126 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
+    my $auto_converter_self = new AutoLoadConverters($pluginlist,$inputargs,$hashArgOptLists,["OpenOfficeConverter"],1);
+
     if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
+    if ($auto_converter_self->{'openoffice_available'}) {
+        # add openoffice convert_to options into list
+        push (@$windows_convert_to_list, @$openoffice_extra_convert_to_list);
+    }
     push(@$arguments,@$opt_windows_args);
     }
-
-    my $auto_converter_self = new AutoLoadConverters($pluginlist,$inputargs,$hashArgOptLists,["OpenOfficeConverter"],1);
-
-    if ($auto_converter_self->{'openoffice_available'}) {
+    elsif ($auto_converter_self->{'openoffice_available'}) {
     push (@$arguments,@$opt_office_args);
     $openoffice_available = 1;