Changeset 24362 for main/trunk/greenstone2/perllib/cgiactions

Timestamp:

2011-08-03T21:17:30+12:00 (13 years ago)

Author:

ak19

Message:

The method of locating perl has changed once more: util now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use.

Location:

main/trunk/greenstone2/perllib/cgiactions

Files:

• baseaction.pm (modified) (3 diffs)
• buildaction.pm (modified) (8 diffs)
• indexaction.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

@@ -28 +28 @@
 
 use strict;
-
+use util;
 use inexport;
-use Config; # for getting the perlpath in the recommended way
 
 our $authenication_enabled = 0;
@@ -434 +433 @@
     my $gsdl_cgi = $self->{'gsdl_cgi'};
 
-    my $sendmail_command = "\"$Config{perlpath}\" -S sendmail.pl";
+    my $sendmail_command = "\"".&util::get_perl_exec()."\" -S sendmail.pl";
     $sendmail_command .= " -to \"" . $mail_to_address . "\"";
     $sendmail_command .= " -from \"" . $mail_from_address . "\"";
@@ -463 +462 @@
     $perl_args = "-collectdir \"$collect_dir\" " . $perl_args;
 
-    my $perl_command = "\"$Config{perlpath}\" -S $script $perl_args";
+    my $perl_command = "\"".&util::get_perl_exec()."\" -S $script $perl_args";
 
 

main/trunk/greenstone2/perllib/cgiactions/buildaction.pm

@@ -36 +36 @@
 
 use util;
-use Config; # for getting the perlpath in the recommended way
 
 BEGIN {
@@ -139 +138 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -178 +177 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -216 +215 @@
     
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -256 +255 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -295 +294 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -334 +333 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -404 +403 @@
         
         ## my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-        my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
+        my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
 
         ($status,$report) = $self->run_build_cmd($cmd);

main/trunk/greenstone2/perllib/cgiactions/indexaction.pm

@@ -29 +29 @@
 
 use strict;
-
+use util;
 use cgiactions::baseaction;
-use Config; # for getting the perlpath in the recommended way
 
 
 @indexaction::ISA = ('baseaction');
-
-
-
-
-
-
 
 # 'a' for action, and 'c' for collection are also compulsorary, and
@@ -133 +126 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -172 +165 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -211 +204 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S full-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -251 +244 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -292 +285 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -329 +322 @@
     $self->lock_collection($username, $collect);
 
-    my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\"";
+    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);