Changeset 963 for trunk/gsdl/src/recpt/buildaction.cpp

Timestamp:

2000-02-22T11:01:02+13:00 (24 years ago)

Author:

sjboddie

Message:

gsdlhome now comes from gsdlsite.cfg

File:

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

trunk/gsdl/src/recpt/buildaction.cpp

@@ -30 +30 @@
 #include "htmlutils.h"
 #include "buildaction.h"
-#include "gsdlhome.h"
 
 ///////////////
@@ -103 +102 @@
     logout << "The page 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";
+           << "was probably not called from the module which instantiated\n"
+           << "this page action.\n";
     return;
   }
@@ -111 +110 @@
   if (rprotolist == NULL) return;
   
-  const recptconf &rcinfo = recpt->get_configinfo ();
-
   // build up javascript and HTML code useful in web forms
   text_t first_dirname = "";
@@ -193 +190 @@
         // check to see if the "collection" is writable
         text_t cfg_fname 
-          = filename_cat(GSDL_GSDLHOME,"collect",*collist_here,"etc","collect.cfg");
+          = filename_cat(gsdlhome, "collect", *collist_here, "etc", "collect.cfg");
         if (!file_writable(cfg_fname))
           {
@@ -276 +273 @@
   // set macro cfgperm based on whether config file can be read or no
   text_t dirname = (args["bc1dirname"] == "") ? first_dirname : args["bc1dirname"];
-  text_t cfg_fname = filename_cat(rcinfo.gsdlhome,"collect",dirname,"etc","collect.cfg");
+  text_t cfg_fname = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
   text_t cfgperm = (file_writable(cfg_fname)) ? "read/write" : "readonly";
   disp.setmacro("cfgperm","build",cfgperm);
@@ -288 +285 @@
       // read in collect.cfg      
       text_t cfg_fname 
-    = filename_cat(GSDL_GSDLHOME,"collect",dirname,"etc","collect.cfg");
+    = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
       ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
       if (cfg_ifs) 
@@ -323 +320 @@
 
       // read in collect.bld
-      text_t bld_fname = filename_cat(rcinfo.gsdlhome,"log",dirname+".bld");
+      text_t bld_fname = filename_cat(gsdlhome, "log", dirname+ ".bld");
       ifstream bld_ifs (bld_fname.getcstr(), ios::in | ios::nocreate);
       if (bld_ifs) 
@@ -356 +353 @@
                  ostream &logout) {
 
+  // make sure we know about a receptionist
+  if (recpt == NULL) {
+    logout << "The page 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";
+    return false;
+  }
 
   if (args["bca"] == "newcol") {
@@ -419 +424 @@
                    outconvertclass &outconvert, ostream &textout, 
                    ostream &logout) {
+
+
 
 
@@ -448 +455 @@
   
       textout << outconvert << disp << headmess << content << "_build:framefooter_\n";
-
-      text_t cmd = filename_cat(GSDL_GSDLHOME,"cgi-bin","webpage_buildcol.pl");
+      text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl");
       cmd += " gsdlhome=\""+args["gsdlhome"]+"\" httpbuild=\""+args["httpbuild"]+"\"";
       cmd += " bc1copydata=\""+args["bc1copydata"]+"\"";