Changeset 31744 for main/trunk/greenstone2/perllib/plugins/UnknownConverterPlugin.pm.bak

Timestamp:

2017-06-22T17:41:38+12:00 (7 years ago)

Author:

ak19

Message:

Further changes to new UnknownConverterPlugin that's still in progress. Now I can at least run pluginfo.pl on the plugin to get a description of it.

File:

• main/trunk/greenstone2/perllib/plugins/UnknownConverterPlugin.pm.bak (modified) (5 diffs)

main/trunk/greenstone2/perllib/plugins/UnknownConverterPlugin.pm.bak

@@ -33 +33 @@
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
+use ConvertBinaryFile;
+use UnknownPlugin;
 
 # TO DO:
@@ -38 +40 @@
 # - Have a TEMPDIR placeholder in the command, which, if present, gets replaced with the usual tempdir location
 # of a collection, and in which case we have to clean up intermediate files generated in there at the end?
+# Add a check that the generated file or files generated in the output dir match the convert_to option selected
+# before trying to process them
 
 sub BEGIN {
@@ -49 +53 @@
     'desc' => "{ConvertBinaryFile.convert_to.html}" },
       { 'name' => "pagedimg_jpg",
-    'desc' => "{{ConvertBinaryFile.convert_to.pagedimg_jpg}" },
+    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_jpg}" },
       { 'name' => "pagedimg_gif",
-    'desc' => "{{ConvertBinaryFile.convert_to.pagedimg_gif}" },
+    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_gif}" },
       { 'name' => "pagedimg_png",
-    'desc' => "{{ConvertBinaryFile.convert_to.pagedimg_png}" }
+    'desc' => "{ConvertBinaryFile.convert_to.pagedimg_png}" }
       ];
 
@@ -118 +122 @@
     push(@$specific_options, "-processing_tmp_files");
     }
+    elsif ($secondary_plugin_name eq "PagedImagePlugin") {
+    push(@$specific_options, "-screenviewsize", "1000");
+    push(@$specific_options, "-enable_cache");
+    push(@$specific_options, "-processing_tmp_files");
+    }
 
     # bless again, copied from PDFPlugin, PowerPointPlugin
     $self = bless $self, $class;
-    $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists;)
+    $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);
     return $self;
 }
@@ -175 +184 @@
     # replace occurrences of '*' placeholder in cmd string with input filename
     my ($tailname, $dir, $suffix) = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
-    $cmd ~= s/\*/$tailname/g;
+    $cmd =~ s/\*/$tailname/g;
     print STDERR "@@@@ $plugin_name: executing conversion cmd $cmd\n";
     my $status = system($cmd);