From: cjwatson <>
Date: Wed, 11 Dec 2002 10:15:15 +0000 (-0800)
Subject: [project @ 2002-12-11 02:15:15 by cjwatson]
X-Git-Tag: release/2.6.0~970
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b9f30d98f9ae4f4b5970b7df636dd1415bc6de77;p=debbugs.git

[project @ 2002-12-11 02:15:15 by cjwatson]
db2html works with db-h now, I think.
---

diff --git a/debian/changelog b/debian/changelog
index 530c500..7739e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ debbugs (2.4.1) UNRELEASED; urgency=low
   * Remove the final use of cgi-lib.pl, so it's gone. Remove copyright
     notices that were there due to using it. [Colin]
   * Accept ';' as well as '&' as a CGI argument separator. [Colin]
+  * db2html now works with the new hashed database layout. [Colin]
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 25 Nov 2002 03:50:20 +0000
 
diff --git a/debian/crontab b/debian/crontab
index 20e2c7d..a882fac 100644
--- a/debian/crontab
+++ b/debian/crontab
@@ -2,7 +2,7 @@
 MAILTO=owner@bugs.benham
 3,18,33,48 	*	* * *	/usr/lib/debbugs/processall >/dev/null
 9,39 		*	* * *	/usr/lib/debbugs/html-control >/dev/null
-22 			7	* * *	touch /var/lib/debbugs/spool/db
+22 			7	* * *	touch /var/lib/debbugs/spool/db-h
 23 			7	* * 3	/usr/lib/debbugs/age-1
 24 			7	* * *	/usr/lib/debbugs/expire >/dev/null
 23 			16	* * 5	/usr/lib/debbugs/mailsummary undone >/dev/null
diff --git a/misc/crontab.in b/misc/crontab.in
index ebedc46..144c115 100644
--- a/misc/crontab.in
+++ b/misc/crontab.in
@@ -3,7 +3,7 @@
 DBC_CRONTAB_MAILTO
 DBC_PROCESS_FREQ	* * *	DBC_SCRIPT_PATH/processall >/dev/null
 DBC_HTMLCHECK_FREQ	* * *	DBC_SCRIPT_PATH/html-control >/dev/null
-22 7			* * *	touch DBC_SPOOL_PATH/db
+22 7			* * *	touch DBC_SPOOL_PATH/db-h
 23 7			* * 3	DBC_SCRIPT_PATH/age-1
 24 7			* * *	DBC_SCRIPT_PATH/expire >/dev/null
 23 16			* * 5	DBC_SCRIPT_PATH/mailsummary undone >/dev/null
diff --git a/scripts/db2html.in b/scripts/db2html.in
index 388c8ac..2c8813a 100755
--- a/scripts/db2html.in
+++ b/scripts/db2html.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: db2html.in,v 1.12 2002/11/25 13:53:44 cjwatson Exp $
+# $Id: db2html.in,v 1.13 2002/12/11 02:15:15 cjwatson Exp $
 # usage: db2html [-diff] [-stampfile=<stampfile>] [-lastrun=<days>] <wwwbase>
 
 #load the necessary libraries/configuration
@@ -60,7 +60,7 @@ if (defined($stampfile))
 }
 
 #only process file if greater than last run...
-if (defined($lastrun) && -M "db" > $lastrun) 
+if (defined($lastrun) && -M "db-h" > $lastrun) 
 {	$_= $gHTMLStamp;
     s/SUBSTITUTE_DTIME/$dtime/o;
     s/\<\!\-\-updateupdate\-\-\>.*\<\!\-\-\/updateupdate\-\-\>/check/;
@@ -81,9 +81,14 @@ while(<MM>)
 close(MM);
 
 #load all database files
-opendir(D,'db') || &quit("opendir db: $!");
-@files= sort { $a <=> $b } readdir(D);
+opendir(D,'db-h') || &quit("opendir db-h: $!");
+@dirs = sort { $a <=> $b } grep(s#^#db-h/#,grep(/^\d+$/,readdir(D)));
 closedir(D);
+foreach my $dir (@dirs) {
+    opendir(D,$dir);
+    push @files, sort { $a <=> $b } grep(/^-?\d+\.log$/,readdir(D));
+    closedir(D);
+}
 
 for $pending (qw(pending done forwarded)) 
 {	for $severity (@showseverities)