Changeset 1148

Timestamp:

2000-05-04T17:18:46+12:00 (24 years ago)

Author:

sjboddie

Message:

attempting to get end-user collection building to work under windows

Location:

trunk/gsdl/src/recpt

Files:

• buildaction.cpp (modified) (3 diffs)
• documentaction.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -434 +434 @@
 
   text_tarray wizard_split;
-  const text_t& wizard = (args["wizard"]=="") ? (text_t)"buildcol" : args["wizard"];
+  const text_t wizard = (args["wizard"].empty()) ? "buildcol" : args["wizard"];
   splitchar(wizard.begin(),wizard.end(),':',wizard_split);
-  const text_t& wizard_last = wizard_split.back();
+  const text_t wizard_last = wizard_split.back();
   
   if (wizard_last != "buildframe")
@@ -449 +449 @@
       text_t dirname = (args["bc1dirname"] == "") ? (text_t)"unknown" : args["bc1dirname"];
       text_t tmpname = dirname+"_XXXXXX";
-      if (mktemp(tmpname.getcstr())==NULL)
-    {
-      logout << "Failed to create temporary filename" << endl;
-    }
+      char *cstr_tmpname = tmpname.getcstr();
+      if (mktemp(cstr_tmpname)==NULL)
+    logout << "Failed to create temporary filename" << endl;
+
+      delete cstr_tmpname;
+
       disp.setmacro("bcargtmpname","build",tmpname);
 
@@ -461 +463 @@
       textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
       text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl");
-      cmd += " gsdlhome=\""+args["gsdlhome"]+"\" httpbuild=\""+args["httpbuild"]+"\"";
+      cmd += " gsdlhome=\""+gsdlhome+"\" httpbuild=\""+args["httpbuild"]+"\"";
       cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";
       cmd += " bc1doimport=\""+args["bc1doimport"]+"\"";

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.38  2000/05/04 05:18:46  sjboddie
+   attempting to get end-user collection building to work under windows
+
    Revision 1.37  2000/04/07 04:40:44  sjboddie
    Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
@@ -177 +180 @@
 #include "querytools.h"
 #include "unitool.h"
-#include "htmlutils.h"
+#include "gsdltools.h"
 
 documentaction::documentaction () {

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.49  2000/05/04 05:18:46  sjboddie
+   attempting to get end-user collection building to work under windows
+
    Revision 1.48  2000/04/14 02:52:06  sjboddie
    tidied up error messaging and set up some debugging info to be output
@@ -231 +234 @@
 #include "cgiutils.h"
 #include "htmlutils.h"
+#include "gsdltools.h"
 #include "OIDtools.h"
 #include <assert.h>
@@ -1230 +1234 @@
   text_t &collection = args["c"];
 
-  disp.setmacro ("gsdlhome", "Global", configinfo.gsdlhome);
+  disp.setmacro ("gsdlhome", "Global", dm_safe(configinfo.gsdlhome));
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);