Changeset 38698 for main/trunk

Timestamp:

2024-02-06T12:58:37+13:00 (3 months ago)

Author:

davidb

Message:

Code introduced to 'paramaterize' the GSDL3SRCHOME part of files saved to .args. Motivation for this is to allow import.pl to be run on one computer, and then the colection files can be transfered to another where buildcol.pl is run

File:

• main/trunk/greenstone2/perllib/convertutil.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/convertutil.pm

@@ -87 +87 @@
 {
     my ($command,$options) = @_;
-
 
     # $options points to a hashtable that must have fields for:
@@ -234 +233 @@
 
     if (open(ARGSOUT,">$args_filename")) {
-    print ARGSOUT $command;
+    # for portability between Greenstone installation, substitute gsdl environment variable in $command
+    my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
+    my $gsdl_substitute_command = $command;
+    $gsdl_substitute_command =~ s@$gsdl3srchome@\$GSDL3SRCHOME@g;
+    
+    print ARGSOUT $gsdl_substitute_command;
     print ARGSOUT "\n";
     close(ARGSOUT);
@@ -300 +304 @@
         if (defined $prev_command) {
         # if commands are different
-        if ($prev_command ne $command) {
+
+        # but first apply the gsdl environment variable substitute, for portability
+        my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
+        my $gsdl_substitute_command = $command;
+        $gsdl_substitute_command =~ s@$gsdl3srchome@\$GSDL3SRCHOME@g;
+        
+        if ($prev_command ne $gsdl_substitute_command) {
             # need to rerun command
             ($regenerated,$result,$had_error)