Changeset 22597 for main/trunk/greenstone2/perllib/plugins/RTFPlugin.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/RTFPlugin.pm (modified) (2 diffs)

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

@@ -35 +35 @@
 }
 
+# currently only converts to HTML
+my $convert_to_list =
+    [ { 'name' => "html",
+    'desc' => "{ConvertBinaryFile.convert_to.html}" } ];
+
 my $arguments =
-    [ { 'name' => "process_exp",
+    [ { 'name' => "convert_to",
+    'desc' => "{ConvertBinaryFile.convert_to}",
+    'type' => "enum",
+    'reqd' => "yes",
+    'list' => $convert_to_list, 
+    'deft' => "html" },
+      { 'name' => "process_exp",
     'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
@@ -71 +82 @@
     $self->{'file_type'} = "RTF";
 
+    # 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 (!defined $secondary_plugin_options->{'TextPlugin'}) {
-    $secondary_plugin_options->{'TextPlugin'} = [];
+
+    if (!defined $secondary_plugin_options->{$secondary_plugin_name}) {
+    $secondary_plugin_options->{$secondary_plugin_name} = [];
     }
-    if (!defined $secondary_plugin_options->{'HTMLPlugin'}) {
-    $secondary_plugin_options->{'HTMLPlugin'} = [];
+    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 "TextPlugin") {
+    push(@$specific_options, "-input_encoding", "utf8");
     }
-    my $text_options = $secondary_plugin_options->{'TextPlugin'};
-    my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
-    
-    #$self->{'input_encoding'} = "utf8";
-    #$self->{'extract_language'} = 1;
-    push(@$text_options, "-input_encoding", "utf8");
-    push(@$text_options,"-extract_language") if $self->{'extract_language'};
-    push(@$html_options, "-description_tags") if $self->{'description_tags'};
-    push(@$html_options,"-extract_language") if $self->{'extract_language'};
-
-    push(@$html_options, "-file_rename_method", "none");
-    push(@$text_options, "-file_rename_method", "none");
-
-    # tell the secondary plugins that they are processing tmp files
-    push(@$html_options, "-processing_tmp_files");
+    elsif ($secondary_plugin_name eq "HTMLPlugin") {
+    push(@$specific_options, "-description_tags") if $self->{'description_tags'};
+    push(@$specific_options, "-processing_tmp_files");
+    }
 
     $self = bless $self, $class;