Changeset 17680

Timestamp:

2008-11-05T12:34:35+13:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed this so that the database file txt.gz is now decompressed and converted into .ldb database file. Works on Windows but requires the help of a new perl script txtgz-to-gdbm.pl

File:

• gsdl/trunk/common-src/src/lib/gdbmclass.cpp (modified) (1 diff)

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

@@ -105 +105 @@
       if (file_exists(txtgz_filename))
       {
-    text_t cmd = "gzip --decompress --to-stdout \"" + txtgz_filename + "\"";
-    cmd += " | txt2db \"" + filename + "\"";
-
+    //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
+    
     int rv = gsdl_system(cmd, true, cerr);
+    // For some reason, launching this command with gsdl_system() still returns 1
+    // even when it returns 0 when run from the command-line. We can check whether
+    // we succeeded by looking at whether the output database file was created.
     if (rv != 0) {
-      cerr << "Tried to run command \""<<cmd<<"\", but it failed\n";
-    }
+      cerr << "\nWarning, non-zero return value on running command \""
+           << cmd << "\": " << rv << endl;
+      if (!file_exists(filename)) {
+        cerr << "Tried to run command \""<<cmd<<"\", but it failed\n";
+      }
+    }   
       }
     }