Changeset 22702 for main

Timestamp:

2010-08-21T00:33:16+12:00 (14 years ago)

Author:

davidb

Message:

Introduction of new plugin AutoloadConverterScripting to replace duplicated code that turns up in plugins like OOConvertBinaryFile and PBConvertBinaryFile

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• AutoloadConverterScripting.pm (added)
• PDFPlugin.pm (modified) (3 diffs)
• WordPlugin.pm (modified) (4 diffs)

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

@@ -25 +25 @@
 package PDFPlugin;
 
-use PBConvertBinaryFile;
 use ReadTextFile;
 use unicode;
 use strict;
-no strict 'refs'; # so we can use a var for filehandles (eg STDERR)
+no strict 'refs'; # so we can use a var for filehandles (e.g. STDERR)
 
 sub BEGIN {
-    @PDFPlugin::ISA = ('PBConvertBinaryFile', 'ReadTextFile');
+    $::autoloadConverterScripting="PDFBoxConverter";
+    require AutoloadConverterScripting;
+
+    @PDFPlugin::ISA = ('AutoloadConverterScripting', 'ReadTextFile');
 }
 
@@ -119 +121 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PBConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new AutoloadConverterScripting("PDFBoxConverter",$pluginlist, $inputargs, $hashArgOptLists);
     
     if ($self->{'info_only'}) {
@@ -147 +149 @@
     }
     # set convert_to_plugin and convert_to_ext
-    $self->PBConvertBinaryFile::set_standard_convert_settings();
+    $self->set_standard_convert_settings();
 
     my $secondary_plugin_name = $self->{'convert_to_plugin'};

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

@@ -25 +25 @@
 package WordPlugin;
 
-use OOConvertBinaryFile;
-
-
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
 no strict 'subs';
+
 use gsprintf 'gsprintf';
 
 sub BEGIN {
-    @WordPlugin::ISA = ('OOConvertBinaryFile');
+    $::autoloadConverterScripting="OpenOfficeConverter";
+    require AutoloadConverterScripting;
+
+    @WordPlugin::ISA = ('AutoloadConverterScripting');
 }
 
@@ -106 +107 @@
     $office_capable = 1;
     }
-    if ($OOConvertBinaryFile::openoffice_ext_working) {
+    if ($AutoloadConverterScripting::openoffice_ext_working) {
     $office_capable = 1;
     }
@@ -117 +118 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new OOConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, $inputargs, $hashArgOptLists);
 
     if ($self->{'info_only'}) {
@@ -210 +211 @@
 sub get_default_process_exp {
     my $self = shift (@_);
-    if ($OOConvertBinaryFile::openoffice_ext_working) {
+    if ($AutoloadConverterScripting::openoffice_ext_working) {
     return q^(?i)\.(doc|dot|docx|odt)$^;
     }