Changeset 12848

Timestamp:

2006-09-26T14:22:03+12:00 (18 years ago)

Author:

nzdl

Message:

try the JAVA_HOME variable first to find java, otherwise just use 'java' [kjdon]

File:

• trunk/gsdl/bin/script/lucene_query.pl (modified) (2 diffs)

trunk/gsdl/bin/script/lucene_query.pl

@@ -36 +36 @@
 use util;
 
-
 my $PROGNAME = $0;
 $PROGNAME =~ s/^.*\/(.*)$/$1/;
 
+
+sub get_java_path()
+{
+    # Check the JAVA_HOME environment variable first
+    if (defined $ENV{'JAVA_HOME'}) {
+    my $java_home = $ENV{'JAVA_HOME'};
+    $java_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific)
+    return &util::filename_cat($java_home, "bin", "java");
+    }
+
+    # Hope that Java is on the PATH
+    return "java";
+}
 
 sub open_java_lucene
@@ -52 +64 @@
     my $out_file = shift(@_);
 
+    my $java = &get_java_path();
     my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrap.jar");
-    my $java_lucene = "java -classpath \"$classpath\" org.nzdl.gsdl.LuceneWrap.GS2LuceneQuery";
+    my $java_lucene = "$java -classpath \"$classpath\" org.nzdl.gsdl.LuceneWrap.GS2LuceneQuery";
 
     my $cmd = "| " . $java_lucene . " \"" . $full_indexdir . "\"";