Changeset 28979 for main/trunk/greenstone2/common-src/src/lib/gsdlsitecfg.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/common-src/src/lib/gsdlsitecfg.cpp (modified) (2 diffs)

main/trunk/greenstone2/common-src/src/lib/gsdlsitecfg.cpp

@@ -26 +26 @@
 #include "fileutil.h"
 #include "gsdlsitecfg.h"
+#include <stdlib.h> // for get/putenv
+#include <string.h> // for get/putenv
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -126 +128 @@
       *collection = cfgline[0];
     } 
+
+    if(key == "javahome") {
+
+      // javahome is a special variable that may or may not be set by the user in gsdlsite.cfg.
+      // It specifies a custom java install that the user wants to use. If set, assume this is 
+      // meant to override the default JAVA_HOME. Any javahome read in from gsdlsite.cfg 
+      // will not be stored into the __site_configuration struct however. Instead, directly 
+      // do putenv(javahome), just like gtiaction.cpp uses putenv, after printing out a warning 
+      // to StdErr if getenv(JAVA_HOME) shows that JAVA_HOME is already set to something.
+
+      text_t javahome(cfgline[0]);
+
+      // getenv returns NULL if not set, http://www.cplusplus.com/reference/cstdlib/getenv/
+      // 'The string pointed by the pointer returned by this function shall not be modified by the program.'
+      char* existing_javahome = getenv("JAVA_HOME"); 
+
+      if(existing_javahome != NULL) {
+    // cerr goes to: apache-httpd/<OS>/logs/error_log
+    cerr << "Warning: JAVA_HOME is already set to: " << existing_javahome << endl;
+    cerr << "But overwriting with javahome set in gsdlsite.cfg: " << javahome << endl;  
+      }
+
+      // http://www.kev.pulo.com.au/pp/RESOURCES/cplusplus/ref/cstdlib/putenv.html
+      // putenv is not defined in ANSI-C, but is supported by many compilers, and is 
+      // already used in gtiaction.cpp
+      javahome = "JAVA_HOME=" + javahome;
+      char* set_javahome_cstr = javahome.getcstr();
+      putenv(set_javahome_cstr);
+
+      // can't use locally declared char array that we string-copy the cstr into, 
+      // since the array's value expires from putenv, possibly after this function's local scope
+      // Forced to assign the dynamically allocated cstr and resist the urge to delete this:
+      //delete[] set_javahome_cstr; // may not delete it, else the env var just set will become empty      
+    }    
 
     if (actions != NULL && key == "actions") {