Changeset 822 for trunk

Timestamp:

1999-12-13T15:21:27+13:00 (24 years ago)

Author:

davidb

Message:

Added viewable log for collection building.

Location:

trunk/gsdl/src/recpt

Files:

• buildaction.cpp (modified) (10 diffs)
• buildaction.h (modified) (2 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -28 +28 @@
 #include "OIDtools.h"
 #include "fileutil.h"
+#include "htmlutils.h"
 #include "buildaction.h"
 #include "gsdlhome.h"
@@ -78 +79 @@
 bool buildaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
                  ostream &/*logout*/) {
-  if (args["bca"] != "buildstatus")
+  if ((args["bca"] != "buildstatus") && (args["bca"] != "collog"))
     {
       // authenticate the user if authentication is avaiable
@@ -97 +98 @@
 void buildaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                       recptprotolistclass *protos, 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;
+  }
+
+  recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
+  if (rprotolist == NULL) return;
+  
+  const recptconf &rcinfo = recpt->get_configinfo ();
 
   // build up javascript and HTML code useful in web forms
@@ -226 +241 @@
     }
 
-  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || (args["bca"]=="buildcol"))
+  if ((args["bca"]=="delcol") || (args["bca"]=="editcol") || (args["bca"]=="buildcol") || (args["bca"]=="collog"))
     {
       disp.setmacro ("dirnamelist", "build", dirnamelist);
@@ -259 +274 @@
   }
 
+  // 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 cfgperm = (file_writable(cfg_fname)) ? "read/write" : "readonly";
+  disp.setmacro("cfgperm","build",cfgperm);
+
   // if edit collection, read in collect.cfg file
   if (args["bca"]=="editcol")
@@ -270 +291 @@
       ifstream cfg_ifs (cfg_fname.getcstr(), ios::in | ios::nocreate);
       if (cfg_ifs) 
-    {
+    {  
+      // read in collect.cfg      
       text_t cfg_text = "";
       
@@ -277 +299 @@
       while (!cfg_ifs.eof ()) {
         cfg_text.push_back(c);
+        if (c=='\\') { cfg_text.push_back('\\'); }
         cfg_ifs.get(c);
       }
     
       cfg_ifs.close();
+      if (cfgperm=="readonly") cfg_text = html_safe(cfg_text);
 
       // define it as a macro
@@ -291 +315 @@
     }
     }
+
+  // if view log, read in collect.bld file
+  if (args["bca"]=="collog")
+    {
+      text_t dirname 
+    = (args["bc1dirname"] == "") ? first_dirname : args["bc1dirname"];
+
+      // read in collect.bld
+      text_t bld_fname = filename_cat(rcinfo.gsdlhome,"log",dirname+".bld");
+      ifstream bld_ifs (bld_fname.getcstr(), ios::in | ios::nocreate);
+      if (bld_ifs) 
+    {
+      text_t bld_text = "";
+      
+      char c;
+      bld_ifs.get(c);
+      while (!bld_ifs.eof ()) {
+        bld_text.push_back(c);
+        if (c=='\\') { bld_text.push_back('\\'); }
+        bld_ifs.get(c);
+      }
+    
+      bld_ifs.close();
+      bld_text = html_safe(bld_text);
+
+      // define it as a macro
+      disp.setmacro("bldfile","build",bld_text);
+    } 
+      else 
+    {
+      text_t error_mess = "Log file currently empty.";
+      disp.setmacro("bldfile","build",error_mess);
+    }
+    }
 }
 
@@ -313 +371 @@
   else if (args["bca"] == "delcol") {
     return do_delcol (args, disp, outconvert, textout, logout);
+  }
+  else if (args["bca"] == "collog") {
+    return do_collog (args, disp, outconvert, textout, logout);
   }
   else if (args["bca"] == "mess") {
@@ -426 +487 @@
 
 
+bool buildaction::do_collog  (cgiargsclass &/*args*/, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, 
+                ostream &/*logout*/) {
+  textout << outconvert << disp << ("_build:header_(_build:headmesscollog_)\n")
+      << ("_build:contentcollog_\n")
+      << ("_build:wizardfooter_\n");
+
+  return true;
+}
+
 bool buildaction::do_mess  (cgiargsclass &args, displayclass &disp, 
                 outconvertclass &outconvert, ostream &textout, 

trunk/gsdl/src/recpt/buildaction.h

@@ -41 +41 @@
   text_t get_action_name () {return "bc";}
   
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
+
   bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
               ostream &logout);
@@ -78 +80 @@
           ostream &logout);
 
+  bool do_collog (cgiargsclass &args, displayclass &disp, 
+          outconvertclass &outconvert, ostream &textout, 
+          ostream &logout);
+
   bool do_mess (cgiargsclass &args, displayclass &disp, 
         outconvertclass &outconvert, ostream &textout,