X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=dohtml;h=b005949fc493d8d5818a6b8dfee8179070dba15f;hb=edf5233a4e26818318ca7900c9c775e450e45f35;hp=8315a3820f38e66cc869f72032a82f51c7a3b0f2;hpb=cacc5a454e15350dc4aa9defa90ed7425683854a;p=bugscan.git

diff --git a/dohtml b/dohtml
index 8315a38..b005949 100755
--- a/dohtml
+++ b/dohtml
@@ -30,10 +30,17 @@ Please contact
 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
 
@@ -46,7 +53,7 @@ realmakepage() {
 
 	filter="$filter $worry"
 
-	html_header "$title" "$date"
+	html_header "$title" "$date_time"
 
 	cat <<EOF
 
@@ -60,7 +67,7 @@ EOF
 	./bugreport -H -s $filter
 	
 	cat <<EOF
-<p>
+</p>
 Explanation for <a href="http://www.debian.org/Bugs/Developer#tags">bug
 tags</a>:
 
@@ -76,26 +83,24 @@ tags</a>:
 </ul>
 
 <p>
-The second set of tags indicate what releases a bug applies to:
-O for oldstable (squeeze), S for stable (wheezy), T for testing (jessie),
-U for unstable (sid) or E for experimental.
-
-<p>
+  The second set of tags indicate what releases a bug applies to:
+  O for oldstable (squeeze), S for stable (wheezy), T for testing (jessie),
+  U for unstable (sid) or E for experimental.
+</p>
 
 EOF
 	./bugreport -H -l $filter
 
 	html_page_creation_notice
 
-	cat <<EOF
-</body>
-</html>
-EOF
+	html_closing_tags
 }
 
 makemainpage() {
+	local	title="$1"	# Title of page
+	local	date_time="$2"	# Date
 
-	header "$title" "$time"
+	header "$title" "$date_time"
 
 	cat <<EOF
 
@@ -116,12 +121,14 @@ EOF
   </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), and the blue line graphs the number of bugs that are a concern
-for the <em>current</em> stable release.</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), 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
@@ -138,15 +145,15 @@ EOF
   <li> <a href="debian/source.html">source</a> 
   <li> <a href="debian/contrib.html">contrib</a>
   <li> <a href="debian/non-free.html">non-free</a>
-  <li><a href="other/pseudo.html">pseudo-packages</a>
+  <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>
+  <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>
+<p clear=both></p>
 EOF
 
 	html_page_creation_notice
@@ -157,6 +164,8 @@ To receive all mails sent to release-critical bugs, subscribe to the
 mailing list.
 
 EOF
+
+	html_closing_tags
 }
 
 makepage() {
@@ -165,21 +174,21 @@ makepage() {
 	mv -f $3.new $3
 }
 
-time=$(date -u -d '@'$(($(stat -c '%Y' status) / 3600 * 3600)))
-oldtime=$(date -u -d '@'$(($(stat -c '%Y' status-old) / 3600 * 3600)))
+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/stable.html" "$time" "-b"
-makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
-makepage "" "$title" "$htmldir/other/pseudo.html" "$time" "pseudo"
+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