Changeset 28979 for main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp

Timestamp:

2014-04-16T17:33:23+12:00 (10 years ago)

Author:

ak19

Message:

GTI on nzdl needs path to java executable. Since a custom javahome property can be set in gsdlsite.cfg, this is now read in if site from gsdlsite.cfg by common-src's gsdlsitecfg.cpp and set as an env var with putenv(), following Dr Bainbridge's idea. This env var is then read back in using getenv in gtiaction.cpp, so that it can run the appropriate java.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp

@@ -87 +87 @@
   text_t set_gsdlos = "GSDLOS=";
 
-  // path to java executable.
-
-  if(java.empty()) {
+  // Path to java executable. If javahome property was set in gsdlsite.cfg, 
+  // then common-src/src/lib/gsdlsite.cfg would have read this in and set it in the env
+  // If the env var is empty, default to trying to use just "java"
+  char* existing_javahome = getenv("JAVA_HOME"); // return value may not be modified by the program
+
+  if(existing_javahome == NULL) {
     //java = "$JAVA_HOME/bin/java"; // doesn't work
-    //java = "/research/root/jdk1.6.0_27/bin/java"; // can hardcode it, which may be necessary on nzdl or if default java is no longer version 6
-    java = "java";
-  }
+    java = "java"; // works locally, but not on nzdl. On nzdl need to set javahome in gsdlsite.cfg
+  } else {    
+    java = existing_javahome; 
+    java += "/bin/java";
+  } 
 
 #if defined (__WIN32__)
@@ -655 +660 @@
     //gti_arguments = "get-first-n-chunks-requiring-work " + target_language_code + " " + translation_file_key + " " + "10000" + " | /opt/jdk1.6.0/bin/java -cp /home/nzdl/gti:/home/nzdl/gti/xalan.jar ApplyXSLT /home/nzdl/gti/gti-generate-excel-xml.xsl -";
 
-    //gti_arguments = "get-first-n-chunks-requiring-work " + target_language_code + " " + translation_file_key + " " + "10000" + " | /research/root/jdk1.6.0_27/bin/java -cp /research/ak19/gs2-svn-gti:/research/ak19/gs2-svn-gti/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -c -t /research/ak19/gs2-svn-gti/bin/script/gti-generate-excel-xml.xsl";
-
-    // don't need to add toplevel gsdlhome to classpath actually, as the following will work from the commandline:
-    // gti.pl get-all-chunks nl coredm | java -cp /research/ak19/gs2-svn-gti/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -t /research/ak19/gs2-svn-gti/bin/script/gti-generate-excel-xml.xsl
+    // don't actually need to add toplevel gsdlhome to classpath
     gti_arguments = "get-first-n-chunks-requiring-work " + target_language_code + " " + translation_file_key + " " + "10000" + " | " + java + " -cp " + gsdlhome + path_separator + gsdlhome + "/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -c -t " + gsdlhome + "/bin/script/gti-generate-excel-xml.xsl";
 
@@ -664 +666 @@
     //gti_arguments = "get-all-chunks " + target_language_code + " " + translation_file_key + " | /opt/jdk1.6.0/bin/java -cp /home/nzdl/gti:/home/nzdl/gti/xalan.jar ApplyXSLT /home/nzdl/gti/gti-generate-excel-xml.xsl -";
 
-    //gti_arguments = "get-all-chunks " + target_language_code + " " + translation_file_key + " | /research/root/jdk1.6.0_27/bin/java -cp /research/ak19/gs2-svn-gti/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -c -t /research/ak19/gs2-svn-gti/bin/script/gti-generate-excel-xml.xsl";
-
-    // don't need to add toplevel gsdlhome to classpath actually, as the following will work from the commandline:
-    // gti.pl get-all-chunks nl coredm | java -cp /research/ak19/gs2-svn-gti/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -t /research/ak19/gs2-svn-gti/bin/script/gti-generate-excel-xml.xsl
+    // don't actually need to add toplevel gsdlhome to classpath
     gti_arguments = "get-all-chunks " + target_language_code + " " + translation_file_key + " | " + java +  " -cp " + gsdlhome + path_separator + gsdlhome + "/bin/java/ApplyXSLT.jar org.nzdl.gsdl.ApplyXSLT -c -t " + gsdlhome + "/bin/script/gti-generate-excel-xml.xsl";
   }
-  
+
   text_t gti_response_xml_text = do_gti_request(gti_arguments, logout);  
   if (gti_response_xml_text == "") {