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

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

@@ -88 +88 @@
     push(@$pluginlist, $class);
 
-    #push(@$inputargs,"-convert_to");
-    #push(@$inputargs,"text");
     push(@$inputargs,"-title_sub");
     push(@$inputargs,'^(Page\s+\d+)?(\s*1\s+)?');
@@ -106 +104 @@
     $self->{'file_type'} = "PS";
 
+    if ($self->{'convert_to'} eq "auto") {
+    $self->{'convert_to'} = "text";
+    }
+
+    # 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->{'HTMLPlugin'}) {
-    $secondary_plugin_options->{'HTMLPlugin'} = [];
-    }
-
-    my $text_options = $secondary_plugin_options->{'TextPlugin'};
-    my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
-
-    if (defined $self->{'convert_to'} && $self->{'convert_to'} =~ m/(pagedimage|pagedimg).*/i) {
-    if (!defined $secondary_plugin_options->{'PagedImagePlugin'}){
-        $secondary_plugin_options->{'PagedImagePlugin'} = [];
-        my $pagedimg_options = $secondary_plugin_options->{'PagedImagePlugin'}; 
-        push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
-        push(@$pagedimg_options, "-file_rename_method", "none");
-        push(@$pagedimg_options, "-processing_tmp_files");
-    }
-    }
+    if (!defined $secondary_plugin_options->{$secondary_plugin_name}) {
+    $secondary_plugin_options->{$secondary_plugin_name} = [];
+    }
+    my $specific_options = $secondary_plugin_options->{$secondary_plugin_name};
+
     # following title_sub removes "Page 1" added by ps2ascii, and a leading
     # "1", which is often the page number at the top of the page. Bad Luck
     # if your document title actually starts with "1 " - is there a better way?
-    #$self->{'input_encoding'} = "utf8";
-    #$self->{'extract_language'} = 1;
-    push(@$text_options, "-input_encoding", "utf8");
-    push(@$text_options,"-extract_language") if $self->{'extract_language'};
-    push(@$text_options , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
-
-    push(@$text_options, "-file_rename_method", "none");
-    push(@$html_options, "-file_rename_method", "none");
-    
-    # tell the secondary plugins that they are processing tmp files
-    push(@$html_options, "-processing_tmp_files");
+    push(@$specific_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+    push(@$specific_options, "-file_rename_method", "none");
+    
+    if ($secondary_plugin_name eq "TextPlugin") {
+    push(@$specific_options, "-input_encoding", "utf8");
+    push(@$specific_options,"-extract_language") if $self->{'extract_language'};
+    } elsif ($secondary_plugin_name eq "PagedImagePlugin") {
+    push(@$specific_options, "-processing_tmp_files");
+    }
 
     $self = bless $self, $class;