]> git.donarmstrong.com Git - bugscan.git/blobdiff - dohtml
consistently use 'date_time' for the same variable
[bugscan.git] / dohtml
diff --git a/dohtml b/dohtml
index d22056c0ad2e35018cf270b0ff97fc6572cdb200..95d786fabc3c9b95b7ee814da5a0319a51e3d2ea 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -1,11 +1,46 @@
 #! /bin/sh
 
-htmldir=/home/sesse/bugscan/www
+htmldir=/org/bugs.debian.org/www/bugscan
+
+html_header() {
+       local   title="$1"      # Title of page
+       local   date="$2"       # Date
+
+       cat <<EOF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>$title, $date</title>
+  </head>
+<body bgcolor="white">
+<h1 align="center">$title</h1>
+
+<h2 align="center">$date</h2>
+
+EOF
+}
+
+html_page_creation_notice() {
+       cat <<EOF
+<hr>
+This page is automatically generated.<br>
+Please contact
+<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
+EOF
+}
+
+html_closing_tags() {
+       cat <<EOF
+</body>
+</html>
+EOF
+}
 
 realmakepage() {
        local   filter="$1"     # Distributions to list
        local   title="$2"      # Title of page
-       local   date="$3"       # Date
+       local   date_time="$3"  # Date
        local   worry="$4"      # Worry about testing only?
        local   descr           # Description of filter
 
@@ -18,20 +53,13 @@ realmakepage() {
 
        filter="$filter $worry"
 
-       cat <<EOF
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>$title, $date</title>
-  </head>
-<body bgcolor="white">
-<h1 align="center">$title</h1>
+       html_header "$title" "$date_time"
 
-<h2 align="center">$date</h2>
+       cat <<EOF
 
 <p align="center">for distribution(s): $descr</p>
 
+<p align="center">You might also want to check out <a href="http://udd.debian.org/bugs/">UDD</a> instead of this page.</p>
 <hr>
 
 <p>
@@ -51,12 +79,12 @@ tags</a>:
    <li><strong>R</strong>: unreproducible</li>
    <li><strong>S</strong>: security</li>
    <li><strong>U</strong>: upstream</li>
-   <li><strong>I</strong>: etch-ignore</li>
+   <li><strong>I</strong>: wheezy-ignore or jessie-ignore</li>
 </ul>
 
 <p>
 The second set of tags indicate what releases a bug applies to:
-O for oldstable (woody), S for stable (sarge), T for testing (etch),
+O for oldstable (squeeze), S for stable (wheezy), T for testing (jessie),
 U for unstable (sid) or E for experimental.
 
 <p>
@@ -64,28 +92,18 @@ U for unstable (sid) or E for experimental.
 EOF
        ./bugreport -H -l $filter
 
-       cat <<EOF
-<hr>
-This page is automatically generated.<br>
-Please contact
-<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
-</body>
-</html>
-EOF
+       html_page_creation_notice
+
+       html_closing_tags
 }
 
 makemainpage() {
-       cat <<EOF
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>$title, $time</title>
-  </head>
-<body bgcolor="white">
-<h1 align="center">$title</h1>
+       local   title="$1"      # Title of page
+       local   date_time="$2"  # Date
 
-<h2 align="center">$time</h2>
+       header "$title" "$date_time"
+
+       cat <<EOF
 
 <p align="center">
 EOF
@@ -95,13 +113,21 @@ EOF
        cat <<EOF
 </p>
 
-<div align="center"><img src="graph.png" alt="Graph of RC bugs"></div>
+<div align="center"><img src="graph-release.png" alt="Graph of RC bugs"></div>
+
+<p>Other graphs:
+  <ul>
+    <li><a href="graph-month.png">Graph for the last month</a></li>
+    <li><a href="graph.png">Graph with all the history</a></li>
+  </ul>
+</p>
 
 <p>The red line graphs all bugs with release-critical severities; the green
 line graphs the number of bugs that are actually a concern for the next
 release (excluding ignored bugs, bugs on packages not in testing, and bugs
 whose tags and/or versioning information indicate that they don't apply to
-testing).</p>
+testing), and the blue line graphs the number of bugs that are a concern
+for the <em>current</em> stable release.</p>
 
 <h2>Recent changes</h2>
 EOF
@@ -121,19 +147,24 @@ EOF
   <li><a href="other/pseudo.html">pseudo-packages</a>
        <a href="http://www.debian.org/Bugs/pseudo-packages">(?)</a>
   <li><a href="other/all.html">Everything in one page</a>
+    <br>
+     + <a href="other/stable.html">Only bugs relevant to stable</a>
     <br>
      + <a href="other/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
-<hr>
-This page is automatically generated.<br>
-Please contact
-<a href="mailto:owner@bugs.debian.org">owner@bugs.debian.org</a> for comments.
+EOF
+
+       html_page_creation_notice
+
+       cat <<EOF
 To receive all mails sent to release-critical bugs, subscribe to the
 <a href="http://lists.debian.org/debian-bugs-rc/">debian-bugs-rc</a>
 mailing list.
 
 EOF
+
+       html_closing_tags
 }
 
 makepage() {
@@ -142,19 +173,21 @@ makepage() {
        mv -f $3.new $3
 }
 
-time=$(date -u --date="$(ls -Ll status | awk '{print $6, $7}'):00 $(date +%z)")
-oldtime=$(date -u --date="$(ls -Ll status-old | awk '{print $6, $7}'):00 $(date +%z)")
+date_time=$(date -u -d '@'$(($(stat -c '%Y' status) / 3600 * 3600)))
+olddate_time=$(date -u -d '@'$(($(stat -c '%Y' status-old) / 3600 * 3600)))
 title="Release-critical bugs status"
 
-makepage "debian" "$title" "$htmldir/debian/all.html" "$time"
-makepage "debian/main" "$title" $htmldir/debian/main.html "$time"
-makepage "debian/contrib" "$title" $htmldir/debian/contrib.html "$time"
-makepage "debian/non-free" "$title" $htmldir/debian/non-free.html "$time"
-makepage "debian/source" "$title" $htmldir/debian/source.html "$time"
+makepage "debian" "$title" "$htmldir/debian/all.html" "$date_time"
+makepage "debian/main" "$title" $htmldir/debian/main.html "$date_time"
+makepage "debian/contrib" "$title" $htmldir/debian/contrib.html "$date_time"
+makepage "debian/non-free" "$title" $htmldir/debian/non-free.html "$date_time"
+makepage "debian/source" "$title" $htmldir/debian/source.html "$date_time"
 
-makepage "" "$title" $htmldir/other/all.html "$time"
-makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
+makepage "" "$title" $htmldir/other/all.html "$date_time"
+makepage "" "$title" "$htmldir/other/stable.html" "$date_time" "-b"
+makepage "" "$title" "$htmldir/other/testing.html" "$date_time" "-t"
+makepage "" "$title" "$htmldir/other/pseudo.html" "$date_time" "pseudo"
 
-makemainpage > $htmldir/index.html.new
+makemainpage "$title" "$date_time" > $htmldir/index.html.new
 mv -f $htmldir/index.html.new $htmldir/index.html