Changeset 1837 for trunk/gsdl/lib

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/lib

Files:

• fileutil.cpp (modified) (3 diffs)
• fileutil.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