Changeset 24103

Timestamp:

2011-05-31T16:27:41+12:00 (13 years ago)

Author:

ak19

Message:

Some minor oversights fixed.

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (4 diffs)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -413 +413 @@
     # formulate the command
     my $cmd = "";
-    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
     $cmd .= "$full_perl_path -S ppttohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
@@ -447 +447 @@
     # formulate the command
     my $cmd = "";
-    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
-    $cmd .= "$full_perl_perl -S xlstohtml.pl ";
+    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_path -S xlstohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
     $cmd .= " 2>\"$output_filestem.err\""
@@ -986 +986 @@
     my $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
     $cmd .= "$full_perl_path -S pdftohtml.pl -zoom $pdf_zoom";
     $cmd .= " -c" if ($pdf_complex);
@@ -1061 +1061 @@
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
     $output_type =~ s/.*\_(.*)/$1/i;
-    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
-    $cmd .= "$full_perl_perl -S pdfpstoimg.pl -convert_to $output_type \"$input_filename\" \"$output_filestem\"";
+    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_path -S pdfpstoimg.pl -convert_to $output_type \"$input_filename\" \"$output_filestem\"";
     if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000) {
     $cmd .= " > \"$output_filestem.out\" 2> \"$output_filestem.err\"";