Changeset 10035

Timestamp:

2005-06-09T17:16:32+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the unnecessary PATH setting code and tidied up the rest of the init() function.

Location:

trunk/gsdl/src/recpt

Files:

• gsdl_modules_cfg.h (modified) (1 diff)
• gtiaction.cpp (modified) (2 diffs)
• gtiaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/gsdl_modules_cfg.h

@@ -54 +54 @@
 #define GSDL_USE_COLLECTOR_ACTION
 #define GSDL_USE_EXTLINK_ACTION
-#undef  GSDL_USE_GTI_ACTION
+#define GSDL_USE_GTI_ACTION
 #define GSDL_USE_PHIND_ACTION
 #define GSDL_USE_PING_ACTION

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -68 +68 @@
 gtiaction::~gtiaction()
 {
-  // Nothing to do in destructor
-}
-
-
-
-bool gtiaction::init (ostream & /*logout*/)
-{
-  // set up GSDLOS, GSDLHOME and PATH environment variables
-  text_t gsdlos, path;
-  unsigned int path_separator = ':';
+  delete[] set_gsdlhome_cstr;
+  delete[] set_gsdlos_cstr;
+}
+
+
+
+bool gtiaction::init (ostream& /*logout*/)
+{
+  // Set GSDLHOME and GSDLOS environment variables
+  text_t set_gsdlhome = "GSDLHOME=" + gsdlhome;
+  text_t set_gsdlos = "GSDLOS=";
 
 #if defined (__WIN32__)
-  gsdlos = "windows";
-  path_separator = ';';
-
-  path = filename_cat(gsdlhome, "bin", "windows", "perl", "bin;");
-
+  set_gsdlos += "windows";
 #else
   struct utsname *buf = new struct utsname();
-  int i = uname (buf);
-  if (i == -1) gsdlos = "linux"; // uname failed
-  else gsdlos.setcstr (buf->sysname);
+  if (uname(buf) == -1) {
+    // uname failed, so this must be linux
+    set_gsdlos += "linux";
+  }
+  else {
+    text_t gsdlos = buf->sysname;
+    lc(gsdlos);
+    set_gsdlos += gsdlos;
+  }
   delete buf;
-  lc (gsdlos);
 #endif
 
-  pathc = getenv ("PATH");
-  path += filename_cat (gsdlhome, "bin", gsdlos);
-  path.push_back (path_separator);
-  path += filename_cat (gsdlhome, "bin", "script");
-  if (pathc != NULL) {
-    path.push_back (path_separator);
-    path += pathc;
-  }
-  path = "PATH=" + path;
-
-  gsdlos = "GSDLOS=" + gsdlos;
-  text_t setgsdlhome = "GSDLHOME=" + gsdlhome;
-
-  // these will be cleaned up in the destructor
-  gsdlosc = gsdlos.getcstr();
-  gsdlhomec = setgsdlhome.getcstr();
-  pathc = path.getcstr();
-  
-  putenv (gsdlosc);
-  putenv (gsdlhomec);
-  putenv (pathc);
+  // These will be cleaned up in the destructor
+  set_gsdlhome_cstr = set_gsdlhome.getcstr();
+  set_gsdlos_cstr = set_gsdlos.getcstr();
+  putenv(set_gsdlhome_cstr);
+  putenv(set_gsdlos_cstr);
 
   return true;
@@ -130 +116 @@
 
   // Authenticate the user before allowing modifications
-  // logout << "Must authenticate for language " + args["tlc"] + "!" << endl;
   args["uan"] = 1;
   args["ug"] = "langadmin_" + args["tlc"];

trunk/gsdl/src/recpt/gtiaction.h

@@ -65 +65 @@
   receptionist *recpt;
 
-  // package whose contents will be displayed in the form space
-  char *gsdlosc;
-  char *gsdlhomec;
-  char *pathc;
+  char* set_gsdlhome_cstr;
+  char* set_gsdlos_cstr;
 
 public: