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

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

@@ -95 +95 @@
     my ($class,$input_args,$hashArgOptLists) = @_;
 
-    my @convert_to_list = split(",",$self->{'convert_to'});
+    my @convert_to_list = split(",",$self->{'convert_to_plugin'});
     my $secondary_plugins = {};
     # find the plugin
@@ -101 +101 @@
     foreach my $convert_to (@convert_to_list) {
     # load in "convert_to" plugin package
-    my $plugin_class = $convert_to."Plugin";
+    my $plugin_class = $convert_to;
     my $plugin_package = $plugin_class.".pm";
 
@@ -143 +143 @@
 
     my $self = new AutoExtractMetadata($pluginlist, $inputargs, $hashArgOptLists);
-    
-    if ($self->{'info_only'}) {
-    # don't worry about any options etc
-    return bless $self, $class;
-    }
-
-    my $convert_to_type = $self->{'convert_to'};
-    if (!defined $convert_to_type || $convert_to_type eq "") {
-    $convert_to_type = "auto";
-    }
-    my $windows_scripting = $self->{'windows_scripting'};
-    $windows_scripting = 0 unless defined $windows_scripting;
-    if ($classPluginName eq "PDFPlugin") {
-    if ($convert_to_type eq "text" && 
-        $ENV{'GSDLOS'} =~ /^windows$/i) {
-        print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
-        $convert_to_type = "html";
-    }
-    } elsif ($classPluginName eq "WordPlugin") {
-    if (($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) || defined $self->{'openoffice_scripting'}) {
-        # we use structured HTML, not normal html
-        $convert_to_type = "structuredhtml";
-    } 
-    } elsif ($classPluginName eq "PowerPointPlugin") {
-    if ($windows_scripting && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type eq "auto") {
-        # we use paged img
-        $convert_to_type = "pagedimg_jpg";
-    } 
-    } elsif ($classPluginName eq "PostScriptPlugin") {
-    if ($convert_to_type eq "auto") {
-        # we use text
-        $convert_to_type = "text";
-    }
-    }
-    
-    if ($convert_to_type eq "auto") {
-    # choose html for now - should choose a format based on doc type
-    $convert_to_type = "html";
-    }
-    
-    if ($convert_to_type eq "html") {
-    $self->{'convert_to'} = "HTML";
+   
+    return bless $self, $class;
+}
+
+# should be called by subclasses after checking and setting 
+# $self->{'convert_to'}
+sub set_standard_convert_settings {
+    my $self =shift (@_);
+    
+    my $convert_to = $self->{'convert_to'};
+    if ($convert_to eq "auto") {
+    $convert_to = "html";
+    $self->{'convert_to'} = "html";
+    }
+
+    if ($convert_to eq "html") {
+    $self->{'convert_to_plugin'} = "HTMLPlugin";
     $self->{'convert_to_ext'} = "html";
-    } elsif ($convert_to_type eq "text") {
-    $self->{'convert_to'} = "Text";
+    } elsif ($convert_to eq "text") {
+    $self->{'convert_to_plugin'} = "TextPlugin";
     $self->{'convert_to_ext'} = "txt";
-    } elsif ($convert_to_type eq "structuredhtml") {
-    $self->{'convert_to'} = "StructuredHTML";
+    } elsif ($convert_to eq "structuredhtml") {
+    $self->{'convert_to_plugin'} = "StructuredHTMLPlugin";
     $self->{'convert_to_ext'} = "html";
-    } elsif ($convert_to_type =~ /^pagedimg/) {
-    $self->{'convert_to'} = "PagedImage";
-    my ($convert_to_ext) = $convert_to_type =~ /pagedimg\_(jpg|gif|png)/i;
+    } elsif ($convert_to =~ /^pagedimg/) {
+    $self->{'convert_to_plugin'} = "PagedImagePlugin";
+    my ($convert_to_ext) = $convert_to =~ /pagedimg\_(jpg|gif|png)/i;
     $convert_to_ext = 'jpg' unless defined $convert_to_ext;
     $self->{'convert_to_ext'} = $convert_to_ext;
     }
-    
-    return bless $self, $class;
-}
-
-
+
+}
 sub init {
     my $self = shift (@_);
@@ -316 +288 @@
     # Execute the conversion command and get the type of the result,
     # making sure the converter gives us the appropriate output type
-    my $output_type="";
-    if ($convert_to =~ m/PagedImage/i) {
-    $output_type = lc($convert_to)."_".lc($convert_to_ext);
-    } else {
-    $output_type = lc($convert_to);
-    }
+    my $output_type=$self->{'convert_to'};
+#    if ($convert_to =~ m/PagedImage/i) {
+#   $output_type = lc($convert_to)."_".lc($convert_to_ext);
+#    } else {
+#   $output_type = lc($convert_to);
+#    }
 
     my $cmd = "perl -S gsConvert.pl -verbose $verbosity ";
@@ -331 +303 @@
     }
     $cmd .= "-errlog \"$errlog\" -output $output_type \"$tmp_filename\"";
-
+    print STDERR "calling cmd $cmd\n";
     $output_type = `$cmd`;