Changeset 514 for trunk/gsdl/src/recpt

Timestamp:

1999-09-02T12:28:42+12:00 (25 years ago)

Author:

rjmcnab

Message:

removed dependancy on GSDL_GSDLHOME

File:

• trunk/gsdl/src/recpt/statusaction.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/statusaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.16  1999/09/02 00:28:42  rjmcnab
+   removed dependancy on GSDL_GSDLHOME
+
    Revision 1.15  1999/07/30 02:24:42  sjboddie
    added collectinfo argument to some functions
@@ -71 +74 @@
 
 #include "statusaction.h"
+#include "fileutil.h"
 #include <assert.h>
 
@@ -583 +587 @@
                    outconvertclass &outconvert, 
                    ostream &textout, ostream &/*logout*/) {
+  if (recpt == NULL) return;
+  const recptconf &rcinfo = recpt->get_configinfo ();
+  text_t initfilename = filename_cat (rcinfo.gsdlhome, "etc", "initout.txt");
+  char *cinitfilename = initfilename.getcstr();
+  if (cinitfilename == NULL) return;
+
   textout << outconvert << disp << "_status:header_(Init log)\n";
   textout << outconvert << "<h2>Init log</h2>\n";
 
-  ifstream initin (GSDL_GSDLHOME "/etc/initout.txt");
+  ifstream initin (cinitfilename, ios::in | ios::nocreate);
+  delete cinitfilename;
   if (initin) {
     textout << outconvert << "<p>The initialisation error log, "
-      GSDL_GSDLHOME "/etc/initout.txt, contains the\n";
+        << initfilename << ", contains the\n";
     textout << outconvert << "following information:\n\n";
     text_t errorpage = "<p><pre>\n";
@@ -605 +616 @@
     
   } else {
-    textout << outconvert << "Couldn't read initialisation error log, " GSDL_GSDLHOME "/etc/initout.txt.\n";
+    textout << outconvert << "Couldn't read initialisation error log, " 
+        << initfilename << ".\n";
   }
 
@@ -614 +626 @@
                     outconvertclass &outconvert, 
                     ostream &textout, ostream &logout) {
+  if (recpt == NULL) return;
+  const recptconf &rcinfo = recpt->get_configinfo ();
+  text_t errfilename = filename_cat (rcinfo.gsdlhome, "etc", "errout.txt");
+  char *cerrfilename = errfilename.getcstr();
+  if (cerrfilename == NULL) return;
+
   textout << outconvert << disp << "_status:header_(Error log)\n";
   textout << outconvert << "<h2>Error log</h2>\n";
   logout << flush;
 
-  ifstream errin (GSDL_GSDLHOME "/etc/errout.txt");
+  ifstream errin (cerrfilename, ios::in | ios::nocreate);
+  delete cerrfilename;
   if (errin) {
-    textout << outconvert << "<p>The error log, " GSDL_GSDLHOME "/etc/errout.txt, contains the\n";
+    textout << outconvert << "<p>The error log, "
+        << errfilename << ", contains the\n";
     textout << outconvert << "following information:\n\n";
     text_t errorpage = "<p><pre>\n";
@@ -636 +656 @@
 
   } else {
-    textout << outconvert << "Couldn't read error log, " GSDL_GSDLHOME "/etc/errout.txt.\n";
+    textout << outconvert << "Couldn't read error log, " 
+        << errfilename << ".\n";
   }