Changeset 1678

Timestamp:

2000-11-20T14:00:34+13:00 (23 years ago)

Author:

sjboddie

Message:

Re-added some recent changes that got lost when the cvs repository was
moved. This was mostly changes to the collector and building code

Location:

trunk/gsdl

Files:

• Install.sh (modified) ( previous)
• bin/script/build (modified) (4 diffs)
• lib/gsdltools.cpp (modified) (3 diffs)
• lib/gsdltools.h (modified) (2 diffs)
• macros/collect.dm (modified) (4 diffs)

trunk/gsdl/bin/script/build

@@ -24 +24 @@
 use util;
 use cfgread;
+
+# set up path - this allows for paths not to be supplied to system calls
+# and overcomes problems when GSDLHOME contains spaces (double quoting
+# the call doesn't work on win2k and probably other variants of winnt)
+my $path_separator = ":";
+$path_separator = ";" if $ENV{'GSDLOS'} =~ /^windows$/;
+$ENV{'PATH'} = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}) .
+    $path_separator . &util::filename_cat($ENV{'GSDLHOME'}, "bin", "script") .
+    $path_separator . $ENV{'PATH'};
 
 &parse_args (\@ARGV);
@@ -149 +158 @@
         if (-e $download_dir) {
             # copy download_dir and all it contains to the import directory
-            my $download_cmd = "perl " . &util::filename_cat ($bindir, "script", "filecopy.pl");
+            my $download_cmd = "perl -S filecopy.pl";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -out \"$outfile.download\"" if $use_out;
@@ -226 +235 @@
     print $out "importing the $collection collection\n\n";
 
-    my $import_cmd = "perl " . &util::filename_cat ($bindir, "script", "import.pl");
+    my $import_cmd = "perl -S import.pl";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     $import_cmd .= " -removeold" unless $append;
@@ -252 +261 @@
     print $out "building the $collection collection\n\n";
 
-    my $build_cmd = "perl " . &util::filename_cat ($bindir, "script", "buildcol.pl");
+    my $build_cmd = "perl -S buildcol.pl";
     $build_cmd .= " -out \"$outfile.build\"" if $use_out;
     $build_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;

trunk/gsdl/lib/gsdltools.cpp

@@ -26 +26 @@
 #include "gsdltools.h"
 
+#if defined(__WIN32__)
+#include <windows.h>
+#include <process.h>
+#endif
+
 bool littleEndian() {
   char s[2] = {'\xFE', '\xEF'};
@@ -52 +57 @@
 // characters (e.g. '&') should be quoted with ""
 
-// on unix systems youcan get the same effext as this function by doing a
-// system call and putting the spawned process in the background
-// (e.g. system (funcname options &);
-
 #if defined (__WIN32__)
-#include <windows.h>
 void gsdl_system (char *cmd, ostream &logout) {
 
@@ -101 +101 @@
   }
 }
+#endif
 
+
+// gsdl_call_perl executes the perl script perl_cmd, passing it all the 
+// arguments provided. 
+
+// Arguments should be char*'s, the last argument should be NULL
+
+// perl_cmd shouldn't contain the path to the script as we use "perl -S"
+// to find it. This means that the PATH environment variable of the calling
+// process should contain the directory where the perl_cmd script lives.
+
+// Uses a standard system() call on unix and a synchronous _spawn() on windows.
+// We use the _spawn() because windows 9* doesn't seem to pass the 
+// environment of the calling process to the new process when using
+// system (which we need to do).
+
+// all arguments will be quoted with double quotes [""] so they should be unquoted
+// when passed in.
+
+// returns the exit status of the called process (-1 if system() or _spawn() failed)
+
+int gsdl_call_perl (char *perl_cmd, ...) {
+
+  va_list argn;
+  char *thisarg = perl_cmd;
+
+#if defined(__WIN32__) && !defined (__GNUC__)
+  int i = 2;
+#define GSDL_MAX_ARGS 20
+  char *args[GSDL_MAX_ARGS];
+  args[0] = "perl";
+  args[1] = "-S";
+#else
+  text_t cmd = "perl -S";
 #endif
+
+  // get arguments
+  va_start(argn, perl_cmd);
+  while(thisarg != NULL) {
+#if defined(__WIN32__) && !defined (__GNUC__)
+    if (i >= GSDL_MAX_ARGS) break;
+    text_t tmp = thisarg;
+    tmp = "\"" + tmp + "\"";
+    args[i] = tmp.getcstr();
+    i++;
+#else
+    cmd += " \"";
+    cmd += thisarg;
+    cmd.push_back ('"');
+#endif
+    thisarg = va_arg(argn, char *);
+  }
+  va_end(argn); 
+
+#if defined(__WIN32__) && !defined (__GNUC__)
+  args[i] = NULL;
+  int rv = _spawnvp (_P_WAIT, "perl", args);
+  while (--i > 2) delete (args[i]);
+#else
+  char *cmdc = cmd.getcstr();
+  int rv = system (cmdc);
+  delete (cmdc);
+#endif
+  return rv;
+}

trunk/gsdl/lib/gsdltools.h

@@ -36 +36 @@
 bool littleEndian();
 
+
 // escapes '\' and '_' characters with '\'
 // note that single '\' characters occurring 
@@ -46 +47 @@
 // program continues and terminates normally). Arguments containing special
 // characters (e.g. '&') should be quoted with ""
+void gsdl_system (char *cmd, ostream &logout);
 
-// on unix systems youcan get the same effext as this function by doing a
-// system call and putting the spawned process in the background
-// (e.g. system (funcname options &);
-//#if defined (__WIN32__)
-void gsdl_system (char *cmd, ostream &logout);
-//#endif
+
+// gsdl_call_perl executes the perl script perl_cmd, passing it all the 
+// arguments provided. 
+
+// Arguments should be text_t's, the last argument should be an empty text_t.
+
+// perl_cmd shouldn't contain the path to the script as we use "perl -S"
+// to find it. This means that the PATH environment variable of the calling
+// process should contain the directory where the perl_cmd script lives.
+
+// Uses a standard system() call on unix and a synchronous _spawn() on windows.
+// We use the _spawn() because windows 9* doesn't seem to pass the 
+// environment of the calling process to the new process when using
+// system (which we need to do).
+
+// all arguments will be quoted with double quotes [""] so they should be unquoted
+// when passed in.
+
+// returns the exit status of the called process (-1 if system() or _spawn() failed)
+int gsdl_call_perl (char *perl_cmd, ...);
+
 
 #endif

trunk/gsdl/macros/collect.dm

@@ -982 +982 @@
 deleted. Possible causes are:
 <ul>
-<li> Greenstone does not have permission to delete the gsdl/collect/_cgibc1dirname_
+<li> Greenstone does not have permission to delete the _gsdlhome_/collect/_cgiargbc1dirname_
 directory.
 </ul>
@@ -1027 +1027 @@
 directory. Possible causes are:
 <ul>
-<li> Greenstone does not have read/write access to the gsdl/tmp
+<li> Greenstone does not have read/write access to the _gsdlhome_/tmp
      directory.
 </ul>
@@ -1040 +1040 @@
 collection (mkcol.pl failed). Possible causes are:
 <ul>
-<li> Greenstone does not have permission to write to the gsdl/tmp
+<li> Greenstone does not have permission to write to the _gsdlhome_/tmp
      directory.
 <li> mkcol.pl perl script errors.
@@ -1077 +1077 @@
 Possible causes are:
 <ul>
-<li> Greenstone does not have permission to write to the gsdl/collect
+<li> Greenstone does not have permission to write to the _gsdlhome_/collect
      directory.
-<li> A _cgiargsbc1dirname_ collection already exists in the gsdl/collect
+<li> A _cgiargbc1dirname_ collection already exists in the _gsdlhome_/collect
      directory.
 </ul>