Changeset 22702
- Timestamp:
- 2010-08-21T00:33:16+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugins
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm
r22675 r22702 25 25 package PDFPlugin; 26 26 27 use PBConvertBinaryFile;28 27 use ReadTextFile; 29 28 use unicode; 30 29 use strict; 31 no strict 'refs'; # so we can use a var for filehandles (e gSTDERR)30 no strict 'refs'; # so we can use a var for filehandles (e.g. STDERR) 32 31 33 32 sub BEGIN { 34 @PDFPlugin::ISA = ('PBConvertBinaryFile', 'ReadTextFile'); 33 $::autoloadConverterScripting="PDFBoxConverter"; 34 require AutoloadConverterScripting; 35 36 @PDFPlugin::ISA = ('AutoloadConverterScripting', 'ReadTextFile'); 35 37 } 36 38 … … 119 121 push(@{$hashArgOptLists->{"OptList"}},$options); 120 122 121 my $self = new PBConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);123 my $self = new AutoloadConverterScripting("PDFBoxConverter",$pluginlist, $inputargs, $hashArgOptLists); 122 124 123 125 if ($self->{'info_only'}) { … … 147 149 } 148 150 # set convert_to_plugin and convert_to_ext 149 $self-> PBConvertBinaryFile::set_standard_convert_settings();151 $self->set_standard_convert_settings(); 150 152 151 153 my $secondary_plugin_name = $self->{'convert_to_plugin'}; -
main/trunk/greenstone2/perllib/plugins/WordPlugin.pm
r22641 r22702 25 25 package WordPlugin; 26 26 27 use OOConvertBinaryFile;28 29 30 27 use strict; 31 28 no strict 'refs'; # allow filehandles to be variables and viceversa 32 29 no strict 'subs'; 30 33 31 use gsprintf 'gsprintf'; 34 32 35 33 sub BEGIN { 36 @WordPlugin::ISA = ('OOConvertBinaryFile'); 34 $::autoloadConverterScripting="OpenOfficeConverter"; 35 require AutoloadConverterScripting; 36 37 @WordPlugin::ISA = ('AutoloadConverterScripting'); 37 38 } 38 39 … … 106 107 $office_capable = 1; 107 108 } 108 if ($ OOConvertBinaryFile::openoffice_ext_working) {109 if ($AutoloadConverterScripting::openoffice_ext_working) { 109 110 $office_capable = 1; 110 111 } … … 117 118 push(@{$hashArgOptLists->{"OptList"}},$options); 118 119 119 my $self = new OOConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);120 my $self = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, $inputargs, $hashArgOptLists); 120 121 121 122 if ($self->{'info_only'}) { … … 210 211 sub get_default_process_exp { 211 212 my $self = shift (@_); 212 if ($ OOConvertBinaryFile::openoffice_ext_working) {213 if ($AutoloadConverterScripting::openoffice_ext_working) { 213 214 return q^(?i)\.(doc|dot|docx|odt)$^; 214 215 }
Note:
See TracChangeset
for help on using the changeset viewer.