Changeset 32026 for main/trunk

Timestamp:

2017-10-05T21:48:01+13:00 (7 years ago)

Author:

ak19

Message:

Some more placeholder strings for the UnknownConverterPlugin to recognise and replace appropriately

File:

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

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

@@ -114 +114 @@
     $self->set_standard_convert_settings();
 
+    # one-time replacements in exec_cmd happen here
+    # don't nest GSDL env paths in (escaped) double quotes, as they're likely to be part of larger paths
+    # 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;
+    
     my $secondary_plugin_name = $self->{'convert_to_plugin'};
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
@@ -245 +254 @@
     }
 
-    # replace occurrences of placeholders in cmd string
+    # 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