Changeset 31766 for main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

Timestamp:

2017-06-29T19:50:02+12:00 (7 years ago)

Author:

ak19

Message:

1. Refactored ConvertBinaryFile:tmp_area_convert_file() to do the conversion command (final portion of the function) in a separate subroutine, the new run_conversion_command(), so that the new subclass UnknownConverterPlugin can override this method. 2. UnknownConverterPlugin currently does the unique portions of its previously overridden tmp_area_convert_file() in the new run_conversion_command() that it now overrides, since it inherits all of tmp_area_convert_file(). 3. Removed currently unused overridden read() method. Also removed some other unwanted things.

File:

• main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm (modified) (1 diff)

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

@@ -263 +263 @@
     my $ensure_path_absolute = 1; # true
     &FileUtils::softLink($input_filename, $tmp_filename, $ensure_path_absolute);
+
+    my $output_filename = $self->run_conversion_command($tmp_dirname, $tmp_filename,
+                            $utf8_tailname, $lc_suffix, $tailname, $suffix);
+
+    return $output_filename;
+}
+
+# The latter half of tmp_area_convert_file: runs the conversion command and returns the output file name
+# Split from tmp_area_convert_file because UnknownConverterPlugin can then inherit all of 
+# tmp_area_convert_file and only needs to override this part:
+sub run_conversion_command {
+    my $self = shift (@_);
+    my ($tmp_dirname, $tmp_filename, $utf8_tailname, $lc_suffix, $tailname, $suffix) = @_;    
+
+    my $outhandle = $self->{'outhandle'};
+    my $convert_to = $self->{'convert_to'};
+    my $failhandle = $self->{'failhandle'};
+
     my $verbosity = $self->{'verbosity'};
     if ($verbosity > 0) {