Changeset 16895

Timestamp:

2008-08-19T14:13:44+12:00 (16 years ago)

Author:

davidb

Message:

Runtime code can now support GDBM database being provided as a gzipped txt file, which is platform independant. If the required .ldb (or .bdb) isn't there than the runtime system executes txt2db to generate it. The rest of the code then works as before

Location:

gsdl/trunk

Files:

• common-src/src/lib/gdbmclass.cpp (modified) (3 diffs)
• common-src/src/lib/gsdltools.cpp (modified) (3 diffs)
• common-src/src/lib/gsdltools.h (modified) (1 diff)
• runtime-src/src/colservr/collectset.cpp (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "gsdltools.h"
 #include "gsdlunicode.h"
+#include "fileutil.h"
+
+
 
 
@@ -44 +47 @@
                   )
 {
+
   text_t data_location;
   int block_size = 512;
@@ -63 +67 @@
   {
     gdbm_mode = GDBM_WRCREAT;
+  }
+
+  if (gdbm_mode == GDBM_READER) {
+    // Looking to read in the database
+    // => check to see if .ldb/.bdb file already there
+    // if not (first time) then generate using txt2db
+    if (!file_exists(filename)) {
+
+      // need to generate architecture native GDBM file using txt2db
+
+      // replace sought after gdbm filename ext with ".txt.gz"
+
+      text_t::const_iterator begin = filename.begin();
+      text_t::const_iterator end= filename.end();
+      text_t::const_iterator here = end;
+
+      bool found_ext = false;
+
+      while (here != begin) {
+    if (*here == '.') {
+      found_ext = true;
+      break;
+    }
+    here--;
+      }
+      
+      text_t filename_root;
+
+      if (found_ext) {
+    filename_root = substr(begin,here);
+      }
+      else {
+    filename_root = filename;
+      }
+
+      text_t txtgz_filename = filename_root + ".txt.gz";
+
+      text_t cmd = "gzip --decompress --to-stdout \"" + txtgz_filename + "\"";
+      cmd += " | txt2db \"" + filename + "\"";
+
+      int rv = gsdl_system(cmd, true, cerr);
+      if (rv != 0) {
+    cerr << "Tried to run command \""<<cmd<<"\", but it failed\n";
+      }
+    }
   }
 

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

@@ -25 +25 @@
 
 #include "gsdltools.h"
+#include "fileutil.h"
 
 #if defined(__WIN32__)
@@ -30 +31 @@
 #include <process.h>
 #endif
+
+#if !defined (__WIN32__)
+#include <sys/utsname.h>
+#include <unistd.h>
+#endif
+
 
 bool littleEndian() {
@@ -160 +167 @@
 }
 
+
+static bool gsdl_setenv_done = false;
+
+bool set_gsdl_env_vars (const text_t& gsdlhome) 
+{
+  if (gsdl_setenv_done) { return true; }
+
+  // set up GSDLOS, GSDLHOME and PATH environment variables
+
+  text_t gsdlos, path;
+  unsigned int path_separator = ':';
+
+#if defined (__WIN32__)
+  gsdlos = "windows";
+  path_separator = ';';
+
+  path = filename_cat (gsdlhome, "bin", "windows", "perl", "bin;");
+
+#else
+  struct utsname *buf = new struct utsname();
+  int i = uname (buf);
+  if (i == -1) gsdlos = "linux"; // uname failed, default to linux
+  else gsdlos.setcstr (buf->sysname);
+  delete buf;
+  lc (gsdlos);
+#endif
+
+  // according to getenv documentation (after a bit of digging), *getenv*
+  // is responsible for the char* pointer returned, so no need for us
+  // to free it (in fact that would be a mistake!)
+
+  char* orig_pathc = getenv ("PATH"); 
+  path += filename_cat (gsdlhome, "bin", gsdlos);
+  path.push_back (path_separator);
+  path += filename_cat (gsdlhome, "bin", "script");
+  if (orig_pathc != NULL) {
+    path.push_back (path_separator);
+    path += orig_pathc;
+  }  
+
+  // these will be cleaned up in the destructor
+  char* gsdlosc = gsdlos.getcstr();
+  char* gsdlhomec = gsdlhome.getcstr();
+  char* pathc = path.getcstr();
+  
+  if ((setenv("GSDLOS",gsdlosc,1)!=0) 
+      || (setenv("GSDLHOME",gsdlhomec,1)!=0) 
+      || (setenv("PATH",pathc,1)!=0))
+    {
+      perror("Setting Greenstone environment variables");
+      return false;
+    }
+
+  delete [] gsdlosc;
+  delete [] gsdlhomec;
+  delete [] pathc;
+
+  gsdl_setenv_done = true;
+
+  return true;
+}
+
+
+
 // attempts to work out if perl is functional
 bool perl_ok (ostream &logout) {

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

@@ -65 +65 @@
 int gsdl_system (const text_t &cmd, bool sync, ostream &logout);
 
+bool set_gsdl_env_vars (const text_t& gsdlhome) ;
+
 // attempts to work out if perl is functional
 bool perl_ok (ostream &logout);

gsdl/trunk/runtime-src/src/colservr/collectset.cpp

@@ -30 +30 @@
 #include "gsdlsitecfg.h"
 #include "gdbmclass.h"
+#include "gsdltools.h"
 #include "fileutil.h"
 #include "filter.h"
@@ -81 +82 @@
     }
   }
+
+  set_gsdl_env_vars(gsdlhome);
 }