From 57feb6cfd2d1c3a6b23e4bbade65252d8e2da31e Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Tue, 7 Jan 2003 15:54:12 +0000
Subject: [PATCH] Change 'User' and 'Group' to 'Usr' and 'Grp' not to conflict
 with groups

SVN revision: 314
---
 doc/CHANGELOG.TXT |  8 ++++++--
 doc/config.html   | 37 +++++++++++++++++++++++++++++++++++--
 elogd.c           | 14 ++++++++++++--
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/doc/CHANGELOG.TXT b/doc/CHANGELOG.TXT
index 026887e2..d652eb69 100755
--- a/doc/CHANGELOG.TXT
+++ b/doc/CHANGELOG.TXT
@@ -1,11 +1,15 @@
-Version 2.2.5, released December xxth, 2002
-===========================================
+Version 2.2.5, released Januar xxth, 2003
+=========================================
 
 - Improved speed for sending many email notifications
 - Added "Omit email to" option
 - Added "Suppress Email to users" option
 - Email recipients can now use subsitution like $name
 - Added hierarchical logbooks
+- Improved performance for large (>1000 entries) logbooks
+- Do not display all pages for large logbooks
+- Added "Resource dir" and "Logbook dir"
+- Replaced "Data dir" by "Subdir" in elogd.cfg
 
 Version 2.2.4, released December 12th, 2002
 ===========================================
diff --git a/doc/config.html b/doc/config.html
index 3cd3171a..00f704d6 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -186,13 +186,46 @@ contain the port number if not the standard port 80 is used like<br>
 <code>URL = http://host.domain:8080/</code>
 <p>
 
-<LI><b><code>User = &lt;name&gt;</code></b>
-<LI><b><code>Group = &lt;name&gt;</code></b>
+<LI><b><code>Usr = &lt;name&gt;</code></b>
+<LI><b><code>Grp = &lt;name&gt;</code></b>
 <br>
 The user and group to run the elogd daemon under when started by root.<p>
 
 </UL>
 
+<hr>
+<div class=section>&nbsp; Groups of logbooks &nbsp;</div>
+<p>
+
+If installations have very many logbooks, it can be hard to navigate between them.
+To make things more structured, it is possible to build a hierarchy of logbooks. A
+logbook group can contain any number of logbooks as well as other logbook groups.
+The hierarchy is defined with the the option<p>
+
+<b><code>Group &lt;group name&gt; = &lt;Logbook1&gt;, &lt;Logbook2&gt;, &lt;other group&gt;</b></code><p>
+
+in the <b><code>[global]</code></b> section of the configuration file.<p>
+
+To define following logbook hierarchy:<p>
+
+<img src="hierarchy.gif"><p>
+
+one would use following statements:
+
+<ul><pre>
+[global]
+Group Linux PCs = Red Hat, Debian, Mandrake
+Group Windows PCs = 98, ME, NT, XP, CE
+Group CE = 1.0, 2.0
+</pre></ul>
+
+The logbook tabs would then look like this:<p>
+
+<img src="tabs.gif"><p>
+
+Where the selected group or logbook becomes blue. The lower groups/logbooks change according
+to the selected upper group.<p>
+
 <hr>
 <div class=title>&nbsp; Individual logbook options &nbsp;</div>
 <p>
diff --git a/elogd.c b/elogd.c
index 5034b8fe..4ad1a77f 100755
--- a/elogd.c
+++ b/elogd.c
@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 2.120  2003/01/07 15:54:12  midas
+  Change 'User' and 'Group' to 'Usr' and 'Grp' not to conflict with groups
+
   Revision 2.119  2003/01/07 15:17:28  midas
   Improved performance, introduced resource and logbook dirs
 
@@ -11340,7 +11343,7 @@ struct timeval       timeout;
     struct group  *gr;
     struct passwd *pw;
 
-    if (getcfg("global", "Group", str))
+    if (getcfg("global", "Grp", str))
       {
       gr = getgrnam(str);
 
@@ -11352,7 +11355,7 @@ struct timeval       timeout;
     else
       setgid(getgid()); /* used for setuid programs */
 
-    if (getcfg("global", "User", str))
+    if (getcfg("global", "Usr", str))
       {
       pw = getpwnam(str);
 
@@ -12247,6 +12250,13 @@ struct tm *tms;
   strlcpy(logbook_dir, LOGBOOK_DIR, sizeof(logbook_dir));
 #endif
 
+  /* look for config file in command line parameters */
+  for (i=1 ; i<argc ; i++)
+    {
+    if (argv[i][0] == '-' && argv[i][1] == 'c')
+      strcpy(config_file, argv[i+1]);
+    }
+
   /* check for configuration file */
   fh = open(config_file, O_RDONLY | O_BINARY);
   if (fh < 0)