Changeset 16949

Timestamp:

2008-08-21T15:34:51+12:00 (16 years ago)

Author:

davidb

Message:

Wrong variable used in putenv(). Needed to put 'putpath' not 'path'

File:

• gsdl/trunk/common-src/src/lib/gsdltools.cpp (modified) (2 diffs)

gsdl/trunk/common-src/src/lib/gsdltools.cpp

@@ -26 +26 @@
 #include "gsdltools.h"
 #include "fileutil.h"
+
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace/std/iostream>
+#elif defined(GSDL_USE_IOS_H)
+#  include <iostream.h>
+#else
+#  include <iostream>
+using namespace std;
+#endif
+
 
 #if defined(__WIN32__)
@@ -216 +227 @@
   retain_gsdlosc   = putgsdlos.getcstr();
   retain_gsdlhomec = putgsdlhome.getcstr();
-  retain_pathc     = path.getcstr();
+  retain_pathc     = putpath.getcstr();
   
   if ((putenv(retain_gsdlosc)!=0) || (putenv(retain_gsdlhomec)!=0)  
   || (putenv(retain_pathc)!=0))
     {
-      perror("Setting Greenstone environment variables with putenv()");
+      // Would be better if the ostream& logout was used here.
+      cerr << "Error setting Greenstone environment variables with putenv()" << endl;
+      // perror("putenv(...): "); // This didn't yield any noticable output under Windows running local library server
       return false;
     }