Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/buildaction.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/buildaction.cpp (modified) (14 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/buildaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifndef __WIN32__
-#include <unistd.h>
-#endif
-
 #include "OIDtools.h"
 #include "fileutil.h"
 #include "htmlutils.h"
+#include "gsdltools.h"
 #include "buildaction.h"
 
@@ -80 +77 @@
 bool buildaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
                  ostream &/*logout*/) {
-  if ((args["bca"] != "buildstatus") && (args["bca"] != "collog"))
+
+  text_t &arg_bca = args["bca"];
+  if (!((arg_bca == "buildstatus") || (arg_bca == "collog") || (arg_bca == "blankpage") 
+    || ((arg_bca == "buildcol") && (args["wizard"] == "buildexec"))))
     {
       // authenticate the user if authentication is avaiable
@@ -102 +102 @@
   // make sure we know about a receptionist
   if (recpt == NULL) {
-    logout << "The page action does not contain information\n"
+    logout << "The build action does not contain information\n"
            << "about any receptionists. The method set_receptionist\n"
            << "was probably not called from the module which instantiated\n"
-           << "this page action.\n";
+           << "this build action.\n";
     return;
   }
@@ -116 +116 @@
   text_t fullnamelist = "var fullnamelist = new Array(";
   text_t dirnamelist  = "var dirnamelist = new Array(";
-  text_t fullnamemenu = (text_t)"<input type=hidden name=\"bc1fullnameindex\""
-                        +" value=\"_bcargfullnameindex_\">\n"
-                        +"<select name=\"bc1fullnamemenu\" onChange=fullnameindex_changed()>\n";
+  text_t fullnamemenu = "<input type=hidden name=\"bc1fullnameindex\"";
+  fullnamemenu += " value=\"_bcargfullnameindex_\">\n";
+  fullnamemenu += "<select name=\"bc1fullnamemenu\" onChange=fullnameindex_changed()>\n";
   int rcount = 1;
   int fcount = 1;
@@ -146 +146 @@
     while (collist_here != collist_end) {
 
-      ColInfoResponse_t cinfo;
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      if (err == noError) {
+      ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
+      if (cinfo != NULL) {
         text_t collectionname = *collist_here;
-        if (!cinfo.collectionmeta["collectionname"].empty())
+        if (!cinfo->collectionmeta["collectionname"].empty())
           {
         // get collection name from the collection cfg file
-        collectionname = cinfo.collectionmeta["collectionname"];
+        collectionname = cinfo->collectionmeta["collectionname"];
           }
         else
@@ -169 +168 @@
         dirnamelist += (text_t)"\"" + *collist_here + "\"";
 
-        fullnamemenu += (text_t)"<option value=\"" + collectionname + "\"";
-        if (args["bc1dirname"] == "")
+        fullnamemenu += "<option value=\"" + collectionname;
+        fullnamemenu.push_back ('"');
+        if (args["bc1dirname"].empty())
           {
         if ((rcount==1) && (ccount==1)) 
@@ -202 +202 @@
         if (args["bca"]=="buildcol")
           {
-        if (((args["bc1dirname"]=="") && (rcount==1) && (ccount==1))
+        if (((args["bc1dirname"].empty()) && (rcount==1) && (ccount==1))
             || (args["bc1dirname"]==*collist_here))
           {
-            disp.setmacro("bcargingsdlarea","build",cinfo.building["ingsdlarea"]);
-            disp.setmacro("bcargcopydir","build",cinfo.building["copydir"]);
+            disp.setmacro("bcargingsdlarea","build",cinfo->building["ingsdlarea"]);
+            disp.setmacro("bcargcopydir","build",cinfo->building["copydir"]);
             
-            if (cinfo.buildDate==0) // not built
+            if (cinfo->buildDate==0) // not built
               {
             // assume that's because this is the first build ever for the collection
@@ -240 +240 @@
     }
 
-  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || (args["bca"]=="buildcol") || (args["bca"]=="collog"))
+  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || 
+      (args["bca"]=="buildcol") || (args["bca"]=="collog"))
     {
       disp.setmacro ("dirnamelist", "build", dirnamelist);
@@ -268 +269 @@
     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++;
@@ -288 +289 @@
       text_t cfg_fname 
     = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
+
+#ifdef GSDL_USE_IOS_H
       ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
+#else
+      ifstream cfg_ifs (cfg_fname.getcstr(), ios::in);
+#endif
+
       if (cfg_ifs) 
     {  
@@ -323 +330 @@
       // read in collect.bld
       text_t bld_fname = filename_cat(gsdlhome, "log", dirname+ ".bld");
+
+#ifdef GSDL_USE_IOS_H
       ifstream bld_ifs (bld_fname.getcstr(), ios::in | ios::nocreate);
+#else
+      ifstream bld_ifs (bld_fname.getcstr(), ios::in);
+#endif
+
       if (bld_ifs) 
     {
@@ -427 +440 @@
                    ostream &logout) {
 
-
-
-
   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")
@@ -444 +454 @@
   else
     {
-      text_t dirname = (args["bc1dirname"] == "") ? (text_t)"unknown" : args["bc1dirname"];
+      text_t dirname = (args["bc1dirname"] == "") ? 
+    "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 (GSDL_MKTEMP (cstr_tmpname)==NULL)
+    logout << "Failed to create temporary filename" << endl;
+
+      delete cstr_tmpname;
+
       disp.setmacro("bcargtmpname","build",tmpname);
 
@@ -457 +472 @@
   
       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 += " bc1copydata=\""+args["bc1copydata"]+"\"";
-      cmd += " bc1doimport=\""+args["bc1doimport"]+"\"";
-      cmd += " bc1dobuild=\""+args["bc1dobuild"]+"\"";
-      cmd += " bc1dirname=\""+args["bc1dirname"]+"\" bc1tmpname=\""+tmpname+"\" &";
-      
-      system(cmd.getcstr());
+      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();
+
+#if defined (__WIN32__)
+      gsdl_system (cstr_cmd, logout);
+#else
+      system (cstr_cmd);
+#endif
+
+      delete cstr_cmd;
     }