Changeset 31744

Timestamp:

2017-06-22T17:41:38+12:00 (6 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.

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/UnknownConverterPlugin.pm.bak (modified) (5 diffs)
• strings.properties (modified) (1 diff)

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);

main/trunk/greenstone2/perllib/strings.properties

@@ -1266 +1266 @@
 TextPlugin.title_sub:Substitution expression to modify string stored as Title. Used by, for example, PostScriptPlugin to remove "Page 1" etc from text used as the title.
 
+UnknownConverterPlugin.desc:If you have a custom conversion tool installed that you're able to run from the command line to convert from an unsupported document format to either text or HTML, provide that command to this Plugin and it will run the command for you, capturing the output for indexing by Greenstone, making your document searchable. Use * as placeholder for input file name, but specify suffix of file to be converted (and also of any output file generated, if a file and not dir of files is generated).
+
+UnknownConverterPlugin.exec_cmd:Command line command string to execute that will do the conversion.
+
+UnknownConverterPlugin.output_file_or_dir_name: Full pathname of the output file or of the directory (of output files) that get generated by the conversion
+
 UnknownPlugin.assoc_field:Name of the metadata field that will hold the associated file's name.