Changeset 5106

Timestamp:

2003-08-07T13:53:14+12:00 (21 years ago)

Author:

jrm21

Message:

need to chomp output of which java.
$opt_d should be "local", not "my"
changed some backticks to system commands.

File:

• trunk/gsdl/perllib/Kea-1.1.4/Kea (modified) (4 diffs)

trunk/gsdl/perllib/Kea-1.1.4/Kea

@@ -82 +82 @@
 if (system("which java >/dev/null 2>/dev/null")==0) {
     $java_exec=`which java`;
+    chomp $java_exec;
 } else {
     $java_exec="$java_home/bin/java";
@@ -94 +95 @@
 # Parse command line options
 use Getopt::Std;
-my $opt_d=0; # debug option
+local $opt_d=0; # debug option
 getopts("dtN:E:C:F:K:L:M:S:");
 
@@ -222 +223 @@
     $file = $ARGV[$f];
     $temp = "$data/$f";
+    $temp =~ s@//@/@g;
     $original_filename{$temp} = $file;
 
     # copy the file to the data directory & coerce into a clause file
-    if ($file =~ /.*\.clauses/) {
-    `cp $file $temp.clauses`;
+    if ($file =~ /.*\.clauses/i) {
+    system("cp","$file","$temp.clauses");
     } else {
-    if ($file =~ /.*\.te?xt/) {
-        `cp $file $temp.txt`;
+    if ($file =~ /.*\.te?xt/i) {
+        system("cp","$file","$temp.txt");
     } elsif ($file =~ /.*\.html?/i) {
-        `cp $file $temp.html`;
+        system("cp", "$file", "$temp.html");
         `$perl_command $gsdlhome/perllib/Kea-1.1.4/convert-html-to-text.pl $temp.html > $temp.txt`;
     } elsif ($file =~ /.*\.cstr/) {
@@ -290 +292 @@
     # open start the new document
     ($doc) = $line =~ /Current document: (.*)\.clauses$/;
+    $doc =~ s@//@/@g;
     $document = $original_filename{$doc};
     $document =~ s/\.[^\.]+$//;