Changeset 1837

Timestamp:

2001-01-15T15:21:43+13:00 (23 years ago)

Author:

sjboddie

Message:

Made a few cosmetic changes to the "Administration" pages and added the
ability to view the last 100 lines of the usage log. This meant making a
change to the file_tail() function to allow for the very long lines that
occur in the log file.

Location:

trunk/gsdl

Files:

• lib/fileutil.cpp (modified) (3 diffs)
• lib/fileutil.h (modified) (1 diff)
• macros/status.dm (modified) (5 diffs)
• src/recpt/collectoraction.cpp (modified) (2 diffs)
• src/recpt/statusaction.cpp (modified) (4 diffs)
• src/recpt/statusaction.h (modified) (1 diff)

trunk/gsdl/lib/fileutil.cpp

@@ -337 +337 @@
 }
 
-// This is a fairly quick and nasty attempt at doing a "tail" on
-// a file (i.e. returning the last numlines lines of filename).
-// It has one important limitation in that it expects lines to be 
-// 256 characters long on average.
-// This of course makes it possible that it won't return numlines
-// lines if there are some very long lines.
-// It also makes it fairly inefficient as it always reads in 
-// numlines*256 characters which is much more than generally 
-// necessary.
+// This is a fairly quick and nasty attempt at doing a "tail" on a file
+// (i.e. returning the last numlines lines of filename).  It has one
+// important limitation in that it expects lines to be linelength
+// characters long on average.  This of course makes it possible that it
+// won't return numlines lines if there are some lines that are longer than
+// linelength.  It also makes it fairly inefficient as it always reads in
+// numlines*linelength characters when it most often doesn't need them all.
 // For current needs it's fine though.
-text_t file_tail (const text_t &filename, int numlines) {
+// -- Pass a linelength of 0 to use the default linelength (256 chars).
+text_t file_tail (const text_t &filename, int numlines, int linelength) {
 
   if (numlines < 1) numlines = 1;
-  streampos numchars = 256*numlines;
+  if (linelength == 0) linelength = 256;
+  
+  streampos numchars = linelength*numlines;
 
   text_tarray lines;
@@ -356 +357 @@
 
   char *filenamec = filename.getcstr();
-  char linec[256];
+  char linec[linelength];
   ifstream file_in (filenamec);
   delete filenamec;
@@ -366 +367 @@
 
     while (!file_in.eof()) {
-      file_in.getline (linec, 256);
+      file_in.getline (linec, linelength);
       ret.setcstr(linec);
       text_t::const_iterator here = ret.begin();

trunk/gsdl/lib/fileutil.h

@@ -56 +56 @@
 bool file_copy (const text_t &fromfile, const text_t &tofile);
 
-text_t file_tail (const text_t &filename, int numlines);
+text_t file_tail (const text_t &filename, int numlines, int linelength);
 
 // returns true if directory created successfully

trunk/gsdl/macros/status.dm

@@ -64 +64 @@
 <a href="_httppagehome_" target=\_top>_textreturnhome_</a>
 
+<p><b>_textconfigfiles_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&p=gsdlsite" target=infoframe>_textgsdlsite_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&p=maincfg" target=infoframe>_textmaincfg_</a>
+
+<p><b>_textlogs_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&p=usagelog" target=infoframe>_textusagelog_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&p=initlog" target=infoframe>_textinitlog_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&p=errorlog" target=infoframe>_texterrorlog_</a>
+
 _If_("_cgiarguma_" ne "\_cgiarguma\_", 
 <p><b>_textusermanage_</b><br>
@@ -77 +86 @@
 <a href="_gwcgi_?e=_compressedoptions_&a=status&p=browserinfo" target=infoframe>_textbrowsers_</a><br>
 <a href="_gwcgi_?e=_compressedoptions_&a=status&p=protocolinfo" target=infoframe>_textprotocols_</a>
-
-<p><b>_textconfigfiles_</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&p=gsdlsite" target=infoframe>_textgsdlsite_</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&p=maincfg" target=infoframe>_textmaincfg_</a>
-
-<p><b>_textlogs_</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&p=initlog" target=infoframe>_textinitlog_</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&p=errorlog" target=infoframe>_texterrorlog_</a>
 }
 
@@ -94 +95 @@
 _textchangepasswd_ {change password}
 
-_textinfo_ {Information}
+_textinfo_ {Technical information}
 _textgeneral_ {general}
 _textarguments_ {arguments}
@@ -106 +107 @@
 
 _textlogs_ {Logs}
+_textusagelog_ {usage log}
 _textinitlog_ {init log}
 _texterrorlog_ {error log}
@@ -112 +114 @@
 _textreturnhome_ {Greenstone home}
 
-_titlewelcome_ { Maintenance and Administration }
+_titlewelcome_ { Administration }
 
 _welcome_ {

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -806 +806 @@
   if (file_exists (bld_file + ".download")) {
     statusline = "Downloading files ...<br>\n";
-    statusline += file_tail (bld_file + ".download", 1);
+    statusline += file_tail (bld_file + ".download", 1, 0);
   } else if (file_exists (bld_file + ".import")) {
     statusline = "Importing collection ...<br>\n";
-    statusline += file_tail (bld_file + ".import", 1);
+    statusline += file_tail (bld_file + ".import", 1, 0);
   } else if (file_exists (bld_file + ".build")) {
     statusline = "Building collection ...<br>\n";
-    statusline += file_tail (bld_file + ".build", 1);
+    statusline += file_tail (bld_file + ".build", 1, 0);
   } else {
     statusline += "creating collection ...<br>\n";
-    statusline += file_tail (bld_file, 1);
+    statusline += file_tail (bld_file, 1, 0);
   }
 
@@ -957 +957 @@
   if (collector_page == "bildfail") {
     text_t bldlog = filename_cat(gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld");
-    text_t rawlog = file_tail (bldlog, 6);
+    text_t rawlog = file_tail (bldlog, 6, 0);
     // we'll shove in some <br> tags where \n's occur
     text_t faillog;

trunk/gsdl/src/recpt/statusaction.cpp

@@ -742 +742 @@
 }
 
+void statusaction::output_usagelog (cgiargsclass &/*args*/, displayclass &disp,
+                    outconvertclass &outconvert, 
+                    ostream &textout, ostream &/*logout*/) {
+
+  // output last 100 lines of usage.txt
+
+  text_t logfilename = filename_cat (gsdlhome, "etc", "usage.txt");
+
+  textout << outconvert << disp << "_status:infoheader_(Usage log)\n";
+  textout << outconvert << "<h2>Usage log</h2>\n";
+
+  textout << outconvert << "<p>The usage log, "
+      << logfilename << ", contains the\n"
+      << "following information:\n"
+      << "<p>(note that if this file is more than 100 lines long only the last 100 lines will\n"
+      << "be displayed on this page)\n\n"
+      << "<pre>\n";
+
+  // note that we're expecting lines to be no more than 1500 characters on
+  // average - should fix this file_tail() thing sometime
+  textout << outconvert << file_tail (logfilename, 100, 1500);
+
+  textout << outconvert << disp << "</pre>\n"
+      << "_status:infofooter_\n";
+}
+
 void statusaction::output_initlog (cgiargsclass &/*args*/, displayclass &disp,
                    outconvertclass &outconvert, 
@@ -762 +788 @@
   if (initin) {
     textout << outconvert << "<p>The initialisation error log, "
-        << initfilename << ", contains the\n";
+        << initfilename << ", contains the\n";
     textout << outconvert << "following information:\n\n";
     text_t errorpage = "<p><pre>\n";
@@ -779 +805 @@
   } else {
     textout << outconvert << "Couldn't read initialisation error log, " 
-        << initfilename << ".\n";
+        << initfilename << ".\n";
   }
 
@@ -1107 +1133 @@
   else if (arg_p == "protocolinfo") output_protocolinfo (args, disp, outconvert, textout, logout);
   else if (arg_p == "collectioninfo") output_collectioninfo (args, disp, outconvert, textout, logout);
+  else if (arg_p == "usagelog") output_usagelog (args, disp, outconvert, textout, logout);
   else if (arg_p == "initlog") output_initlog (args, disp, outconvert, textout, logout);
   else if (arg_p == "errorlog") output_errorlog (args, disp, outconvert, textout, logout);

trunk/gsdl/src/recpt/statusaction.h

@@ -75 +75 @@
                   ostream &textout, ostream &logout);
 
+  void output_usagelog (cgiargsclass &args, displayclass &disp,
+            outconvertclass &outconvert, 
+            ostream &textout, ostream &logout);
+
   void output_initlog (cgiargsclass &args, displayclass &disp, 
                outconvertclass &outconvert,