merge changes from dla source tree

[debbugs.git] / scripts / db2html.in

diff --git a/scripts/db2html.in b/scripts/db2html.in
index 1159ec9757ce81941d2cea574661bfb62a3f38f1..b45d2b95ac0e24a33bf35e61c1135d73897f1d23 100755 (executable)
--- a/scripts/db2html.in
+++ b/scripts/db2html.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: db2html.in,v 1.15 2003/05/25 13:19:13 joy Exp $
+# $Id: db2html.in,v 1.22 2004/04/19 10:03:53 cjwatson Exp $
 # usage: db2html [-diff] [-stampfile=<stampfile>] [-lastrun=<days>] <wwwbase>
 
 #load the necessary libraries/configuration
@@ -11,7 +11,9 @@ require("$config_path/text");
 require("$lib_path/errorlib");
 $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
 
-use POSIX qw(strftime);
+use POSIX qw(strftime tzset);
+$ENV{"TZ"} = 'UTC';
+tzset();
 
 #set current working directory
 chdir("$gSpoolDir") || die "chdir spool: $!\n";
@@ -20,7 +22,8 @@ chdir("$gSpoolDir") || die "chdir spool: $!\n";
 $diff = 0;
 $stampfile = 'stamp.html';
 $tail_html = $gHTMLTail; 
-$expirynote_html = $gHTMLExpireNote;
+$expirynote_html = '';
+$expirynote_html = $gHTMLExpireNote if $gRemoveAge;
 $shorthead = ' Ref   * Package    Keywords/Subject                    Submitter';
 $shortindex = ''; 
 $amonths = -1;
@@ -84,13 +87,14 @@ close(MM);
 
 #load all database files
 opendir(D,'db-h') || &quit("opendir db-h: $!");
-@dirs = sort { $a <=> $b } grep(s#^#db-h/#,grep(/^\d+$/,readdir(D)));
+@dirs = 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));
+    push @files, grep(/^-?\d+\.log$/,readdir(D));
     closedir(D);
 }
+@files = sort { $a <=> $b } @files;
 
 for $pending (qw(pending done forwarded)) 
 {      for $severity (@showseverities) 
@@ -139,7 +143,7 @@ for $f (@files)
         if ($data->{severity} eq '' || $data->{severity} eq 'normal') 
                {       $showseverity= '';
             $addseverity= $gDefaultSeverity;
-        } elsif (grep($data->{severity} eq $_, @strongseverities)) 
+        } elsif (isstrongseverity($data->{severity})) 
                {       $showseverity= "<strong>Severity: $data->{severity}</strong>;\n";
             $addseverity= $data->{severity};
         } else 
@@ -155,6 +159,8 @@ for $f (@files)
             if length($data->{package});
         $indexentry .= $showseverity;
         $indexentry .= "Reported by: ".&sani($data->{originator});
+        $indexentry .= ";\nOwned by: ".&sani($data->{owner})
+            if length($data->{owner});
         $indexentry .= ";\nKeywords: ".&sani($data->{keywords})
             if length($data->{keywords});
         $linkto= $ref; $linkto =~ s,^..,$&/$&,;
@@ -203,14 +209,11 @@ for $f (@files)
                 $font= length($font) ? "<$font>" : '';
                 $daysold= "; $font$days days old$efont";
             }
-            if ($preserveonly) { $submitted= 'THIS IS A BUG IN THE BUG PROCESSOR'; } 
-                       else 
-                       {       $submitted= `TZ=GMT LANG=C \\
-                             date -d '1 Jan 1970 00:00:00 + $data->{date} seconds' \\
-                             '+ %a, %d %b %Y %T %Z'`;
-                $? and die $?;
+            if ($preserveonly) {
+                $submitted = 'THIS IS A BUG IN THE BUG PROCESSOR';
+            } else {
+                $submitted = strftime "%a, %e %b %Y %T %Z", localtime($data->{date});
             }
-            $submitted =~ s/\n$//; $submitted =~ s/, 0/, /g;
             $submitted= "; dated $submitted";
             $indexpart= "pending$addseverity";
         }