Changeset 32028 for main

Timestamp:

2017-10-06T18:55:29+13:00 (7 years ago)

Author:

ak19

Message:

1. Bugfix to previous commit: var might not be on an UnknownConverterPlugin, so the regexes on shouldn't take place then. 2. Shifted to using Kathy's double percent signs denoting placeholders, tested and works still.

File:

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

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

@@ -118 +118 @@
     # It's up to the user to do the (escaped) double-quoting around paths.
     my $cmd = $self->{'exec_cmd'};
-    $cmd =~ s@%GSDL3SRCHOME@$ENV{'GSDL3SRCHOME'}@g;
-    $cmd =~ s@%GSDLHOME@$ENV{'GSDLHOME'}@g;
-    $cmd =~ s@%GSDL3HOME@$ENV{'GSDL3HOME'}@g;
-    $self->{'exec_cmd'} = $cmd;
+    if($cmd) {
+    $cmd =~ s@%%GSDL3SRCHOME@$ENV{'GSDL3SRCHOME'}@g;
+    $cmd =~ s@%%GSDLHOME@$ENV{'GSDLHOME'}@g;
+    $cmd =~ s@%%GSDL3HOME@$ENV{'GSDL3HOME'}@g;
+    $self->{'exec_cmd'} = $cmd;
+    }
     
     my $secondary_plugin_name = $self->{'convert_to_plugin'};
@@ -256 +258 @@
     # replace remaining occurrences of placeholders in cmd string, the ones that change per input file
     #$cmd =~ s@\"@\\"@g;
-    $cmd =~ s@%INPUT_FILE@\"$tmp_filename\"@g; # refer to the softlink
+    $cmd =~ s@%%INPUT_FILE@\"$tmp_filename\"@g; # refer to the softlink
     if(defined $output_dirname) {
-    $cmd =~ s@%OUTPUT@\"$output_dirname\"@g;
+    $cmd =~ s@%%OUTPUT@\"$output_dirname\"@g;
     } else {
-    $cmd =~ s@%OUTPUT@\"$output_filename\"@g;
+    $cmd =~ s@%%OUTPUT@\"$output_filename\"@g;
     }