Changeset 22597 for main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm

Timestamp:

2010-08-10T14:31:53+12:00 (14 years ago)

Author:

kjdon

Message:

code tidy up. rearranged how convertbinaryfile plugins set up their secondary plugins - now only set up the options for the one they are using. all subclass specific code moved out of convertbinaryfile.new into the appropriate plugin file.

File:

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

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

@@ -34 +34 @@
 no strict 'subs';
 use gsprintf 'gsprintf';
-
-#sub BEGIN {
-#    @PowerPointPlugin::ISA = ('ConvertBinaryFile');
-#}
 
 # @ISA dynamically configured to be either OpenOfficeConverter or ConvertBinaryFile
@@ -157 +153 @@
     }
 
-    my $outhandle = $self->{'outhandle'};
-
     $self->{'filename_extension'} = "ppt";
     $self->{'file_type'} = "PPT";
+
+    if ($self->{'convert_to'} eq "auto") {
+    if ($self->{'windows_scripting'}) {
+        $self->{'convert_to'} = "pagedimg_jpg";
+    }
+    else {
+        $self->{'convert_to'} = "html";
+    }
+    }
+
+   my $outhandle = $self->{'outhandle'};
 
     # can't have windows_scripting and openoffice_scripting at the same time
@@ -172 +177 @@
     $self->{'convert_options'} = "-windows_scripting" if $self->{'windows_scripting'};
     $self->{'convert_options'} = "-openoffice_scripting" if $self->{'openoffice_scripting'};
+
+    # set convert_to_plugin and convert_to_ext
+    $self->ConvertBinaryFile::set_standard_convert_settings();
+
+    my $secondary_plugin_name = $self->{'convert_to_plugin'};
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
 
-    if ($self->{'windows_scripting'} && ($self->{'convert_to'} =~ m/(pagedimage|pagedimg).*/i)) {
-    $secondary_plugin_options->{'PagedImagePlugin'} = [];
-    } else {
-    $secondary_plugin_options->{'HTMLPlugin'} = [];
-    $secondary_plugin_options->{'TextPlugin'} = [];
-    }
-    my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
-    my $text_options = $secondary_plugin_options->{'TextPlugin'};
-    my $pageimg_options = $secondary_plugin_options->{'PagedImagePlugin'};
- 
-    if (defined $html_options){
-    # ppthtml doesn't output utf-8 necessarily - let Greenstone determine the encoding
-    #push(@$html_options,"-input_encoding", "utf8");
-    push(@$html_options,"-extract_language") if $self->{'extract_language'};
-    push(@$html_options,"-file_rename_method", "none");
-    
-    push(@$html_options, "-processing_tmp_files");
-    
-    # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj) 
-    # to extract these metadata fields from the HEAD META fields
-    push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
-    } 
-    if (defined $text_options){
-    #push(@$text_options,"-input_encoding", "utf8");
-    push(@$text_options,"-extract_language") if $self->{'extract_language'};
-    push(@$text_options,"-file_rename_method", "none");
-    }
-    if (defined $pageimg_options){
+    if (!defined $secondary_plugin_options->{$secondary_plugin_name}) {
+    $secondary_plugin_options->{$secondary_plugin_name} = [];
+    }
+    my $specific_options = $secondary_plugin_options->{$secondary_plugin_name};
+
+    push(@$specific_options, "-file_rename_method", "none");
+    push(@$specific_options, "-extract_language") if $self->{'extract_language'};
+
+    if ($secondary_plugin_name eq "HTMLPlugin") {
+    push(@$specific_options, "-processing_tmp_files");
+    push(@$specific_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
+    }
+    elsif ($secondary_plugin_name eq "PagedImagePlugin") {
+    push(@$specific_options, "-processing_tmp_files");
     #is this true??
-    push(@$pageimg_options,"-input_encoding", "utf8");
-    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'}; 
-    push(@$pageimg_options,"-file_rename_method", "none");
-    push(@$pageimg_options, "-processing_tmp_files");
+    push(@$specific_options,"-input_encoding", "utf8");
     }