Changeset 17701

Timestamp:

2008-11-05T15:26:44+13:00 (15 years ago)

Author:

ak19

Message:

Prints a warning if Perl is not on the path (if it can't be found). This may happen if gs2 was checked out from svn (bin install puts perl in bin-windows folder) *and* if Perl is not installed or not on the PATH.

File:

• gsdl/trunk/common-src/src/lib/gdbmclass.cpp (modified) (3 diffs)

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

@@ -28 +28 @@
 #include "gsdlunicode.h"
 #include "fileutil.h"
-
+#include "stdlib.h"
 
 
@@ -107 +107 @@
     //text_t cmd = "gzip --decompress --to-stdout \"" + txtgz_filename + "\"";
     //cmd += " | txt2db \"" + filename + "\"";
-    
-    text_t cmd;
-#ifdef __WIN32__
-    cmd = "perl -S txtgz-to-gdbm.pl \"" + txtgz_filename + "\" \"" + filename + "\"";
-#else
-    cmd = "perl txtgz-to-gdbm.pl \"" + txtgz_filename + "\" \"" + filename + "\"";
-#endif
-    
+
+    // Test to make sure Perl is on the path
+    text_t cmd_test = "perl -v";
+    int rv_test = gsdl_system(cmd_test, true, cerr);
+    if (rv_test != 0) {
+      cerr << "Tried to find Perl. Return exit value of running " 
+           << cmd_test <<": "<< rv_test << ", (expected this to be 0)" << endl;
+      cerr << "Check that Perl is set in your environment variable PATH." << endl;
+      cerr << "At present, PATH=" << getenv("PATH") << endl;
+    }
+
+    text_t cmd = "perl -S txtgz-to-gdbm.pl \"" + txtgz_filename + "\" \"" + filename + "\"";
     int rv = gsdl_system(cmd, true, cerr);
     // For some reason, launching this command with gsdl_system() still returns 1
@@ -120 +124 @@
     // we succeeded by looking at whether the output database file was created.
     if (rv != 0) {
-      cerr << "\nWarning, non-zero return value on running command \""
+      cerr << "Warning, non-zero return value on running command \""
            << cmd << "\": " << rv << endl;
       if (!file_exists(filename)) {
-        cerr << "Tried to run command \""<<cmd<<"\", but it failed\n";
+        cerr << "Tried to run command \""<<cmd<<"\", but it failed" << endl;
       }
     }