Changeset 1177

Timestamp:

2000-05-19T16:57:23+12:00 (24 years ago)

Author:

sjboddie

Message:

finished off tidying up end-user collection building

File:

• trunk/gsdl/src/recpt/buildaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -27 +27 @@
 #include "fileutil.h"
 #include "htmlutils.h"
+#include "gsdltools.h"
 #include "buildaction.h"
 
@@ -269 +270 @@
     text_t bc1name = substr(args_entry.begin()+3,args_entry.end());
     text_t cached_cgiarg = "bcarg" + bc1name;
-    disp.setmacro(cached_cgiarg, "build", args[args_entry]);
+    disp.setmacro(cached_cgiarg, "build", dm_safe(args[args_entry]));
       }
     args_here++;
@@ -440 +441 @@
                    ostream &logout) {
 
-
-
-
   text_tarray wizard_split;
   const text_t wizard = (args["wizard"].empty()) ? "buildcol" : args["wizard"];
@@ -475 +473 @@
   
       textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
-      text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl");
-      cmd += " httpbuild=\""+args["httpbuild"]+"\"";
-      cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";
-      cmd += " bc1doimport=\""+args["bc1doimport"]+"\"";
-      cmd += " bc1dobuild=\""+args["bc1dobuild"]+"\"";
-      cmd += " bc1dirname=\""+args["bc1dirname"]+"\" bc1tmpname=\""+tmpname+"\" &";
-      
+      text_t cmd = "perl \"" + 
+    filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl") + "\"";
+      cmd += " \"httpbuild="+args["httpbuild"]+"\"";
+      cmd += " \"bc1copydata="+args["bc1copydata"]+"\"";
+      cmd += " \"bc1doimport="+args["bc1doimport"]+"\"";
+      cmd += " \"bc1dobuild="+args["bc1dobuild"]+"\"";
+      cmd += " \"bc1dirname="+args["bc1dirname"]+"\" \"bc1tmpname="+tmpname+"\"";
+      // run webpage_buildcol.pl in background on unix systems
+#if !defined (__WIN32__)
+      cmd += " &";
+#endif
+
       char *cstr_cmd = cmd.getcstr();
-      system(cstr_cmd);
+
+#if defined (__WIN32__)
+      gsdl_system (cstr_cmd, logout);
+#else
+      system (cstr_cmd);
+#endif
+
       delete cstr_cmd;
     }