--- parse_log.cgi	2003/10/07 14:39:58	1.7
+++ parse_log.cgi	2003/10/07 20:24:45	1.8
@@ -8,8 +8,8 @@
 
 use strict;
 use POSIX qw(strftime);
-use CGI qw/:standard *table/;
-use CGI::Carp qw(fatalsToBrowser);
+use CGI;
+#use CGI::Carp qw(fatalsToBrowser);
 use Data::Sorting qw(:arrays);
 use Time::ParseDate;
 use Time::Available;
@@ -194,41 +194,37 @@
 
 # generate output
 #
-print header,start_html("mon availiability report");
+print $q->header,$q->start_html("mon availiability report");
 
 # make some filters
 #
 
-print start_form,
-	start_table({-border=>0,-cellspacing=>0,-cellpadding=>0}),
-	Tr(td(
-	em("Show just service/group:"),br,
-	checkbox_group(-name=>'sg_filter',
+print $q->start_form,'
+	<table border=0 cellspacing=0 cellpadding=0>
+	<tr><td>
+	<em>Show just service/group:</em><br>
+	',$q->checkbox_group(-name=>'sg_filter',
 		-values=>[keys %$sg_filter],
 		-default=>[keys %$sg_filter],
 		-linebreak=>'true',
-		),
-	),td(
-	em("Other options:"),br,
+		),'
+	</td><td>
+	<em>Other options:</em><br>',
 	$q->checkbox(-name=>'rep_reset',-checked=>0,
-	-label=>"show repeated failures on same service as individual failures"),
-	br,
+	-label=>"show repeated failures on same service as individual failures"),'<br>',
 	$q->checkbox(-name=>'print_orphans',-checked=>0,
-	-label=>"show records which are not complete in this interval"),
-	br,
+	-label=>"show records which are not complete in this interval"),'<br>',
 	$q->checkbox(-name=>'use_date_limit',-checked=>1,
 	-label=>"use date limit from:"),
-	$q->textfield(-name=>'from_date',-size=>20,-default=>$from_date),
-	" to: ",
-	$q->textfield(-name=>'to_date',-size=>20,-default=>$to_date),
-	small('Using <a href="http://search.cpan.org/search?mode=module&query=Time::ParseDate">Time::ParseDate</a>'),
-	br,
-	$q->checkbox(-name=>'use_time_limit',-checked=>1, -value=>'on',
+	$q->textfield(-name=>'from_date',-size=>20,-default=>$from_date),' to: ',
+	$q->textfield(-name=>'to_date',-size=>20,-default=>$to_date),'
+	<small>Using <a href="http://search.cpan.org/search?mode=module&query=Time::ParseDate">Time::ParseDate</a></small>
+	<br>
+	',$q->checkbox(-name=>'use_time_limit',-checked=>1, -value=>'on',
 	-label=>"use time limit for each day:"),
-	$q->textfield(-name=>'from_time_interval',-size=>8,-default=>$from_time_interval),
-	" to: ",
+	$q->textfield(-name=>'from_time_interval',-size=>8,-default=>$from_time_interval),' to: ',
 	$q->textfield(-name=>'to_time_interval',-size=>8,-default=>$to_time_interval),
-	br,"Days: ",
+	'<br>Days: ',
 	$q->checkbox_group(-name=>'day_interval',
 		-values=>[ sort { $a <=> $b } keys %days ],
 		-labels=>\%days,
@@ -239,10 +235,17 @@
 			Time::Available::DAY_THURSDAY,
 			Time::Available::DAY_FRIDAY,
 		]
-		),
-	$q->submit(-name=>'show',-value=>'Show report'),
-	)),end_table,
-	end_form;
+	),
+	$q->submit(-name=>'show',-value=>'Show report'),'
+	</td></tr>
+	</table>
+	',$q->end_form;
+
+# bail out of no data
+if ($data && scalar @$data < 1) {
+	print $q->end_html;
+	exit;
+}
 
 # dump report
 #
@@ -280,28 +283,20 @@
 #
 my @sorted = sorted_array( @$data, @sort_rules );
 
-print "-- sort: ",Dumper(@sort_rules)," (data: ".@$data." sorted: ".@sorted.") --\n",br,"-- dayMask: $dayMask --\n",br,"-- cache_key: $cache_key --\n",br if ($debug);
-
-print start_table({-border=>1,-cellspacing=>0,-cellpadding=>2,-width=>'100%'});
+print "-- sort: ",Dumper(@sort_rules)," (data: ".@$data." sorted: ".@sorted.") --\n<br>-- dayMask: $dayMask --\n<br>-- cache_key: $cache_key --\n<br>" if ($debug);
 
-print Tr(
-		th("group/service"),
-		th({-bgcolor=>'#f0f0f0'},'<nobr>'.
-			&sort_link($q,'from','u').' from '.
-			&sort_link($q,'from','d').'</nobr>',
-			br,$from_html
-		),
-		th(	'<nobr>'.
-			&sort_link($q,'to','u').' to '.
-			&sort_link($q,'to','d').'</nobr>',
-			br,$to_html
-		),
-		th({-bgcolor=>'#e0e0e0'},'<nobr>'.
-			&sort_link($q,'dur','u').' duration '.
-			&sort_link($q,'dur','d').'</nobr>'
-		),
-		th("description")
-	) if (scalar @sorted > 0);
+print '<table border=1 cellspacing=0 cellpadding=2 width="100%">
+	<tr>
+	<th>group/service</th><th bgcolor="#f0f0f0"><nobr>',
+	&sort_link($q,'from','u'),' from ',&sort_link($q,'from','d'),'</nobr>';
+print '<br>',$from_html if ($from_html);
+print '</th><th><nobr>',
+	&sort_link($q,'to','u'),' to ',&sort_link($q,'to','d'),'</nobr>';
+print '<br>',$to_html if ($to_html);
+print '</th><th bgcolor="#e0e0e0"><nobr>',
+	&sort_link($q,'dur','u'),' duration ',&sort_link($q,'dur','d'),'</nobr>
+	</th><th>description</th>
+	</tr>';
 
 my $downtime;		# total downtime
 my $downinterval;	# total downtime in time interval
@@ -325,29 +320,32 @@
 	}
 	$sg_count->{$row->{sg}}++;
 
-	print Tr(
-		td({-align=>'left',-valign=>'center'},$row->{sg}),
-		td({-align=>'right',-bgcolor=>'#f0f0f0'},$from),
-		td({-align=>'right'},d($row->{to})),
-		td({-align=>'center',-bgcolor=>'#e0e0e0'},$dur),
-		td({-align=>'left'},$row->{desc}),
-		),"\n";
+	print '<tr>
+		<td align="left" valign="center">',$row->{sg},'</td>
+		<td align="right" bgcolor="#f0f0f0">',$from,'</td>
+		<td align="right">',d($row->{to}),'</td>
+		<td align="center" bgcolor="#e0e0e0">',$dur,'</td>
+		<td align="left">',$row->{desc},'</td>
+		</tr>';
 }
 
 # dump totals
 #
 
+my $dur;
 foreach my $sg (keys %$downtime) {
-	my $dur;
 	if ($downinterval->{$sg}) {
 		$dur=dur($downinterval->{$sg})."<br><nobr><small>&sum; ".dur($downtime->{$sg})."</small></nobr>";
 	} else {
 		$dur=dur($downtime->{$sg});
 	}
-	print Tr(td({-colspan=>3,-align=>'right'},"total for $sg:"),
-		td({-bgcolor=>'#e0e0e0',-align=>'right'},$dur),
-		td(small("in ".$sg_count->{$sg}." failures"))),"\n";
+	print '<tr><td colspan=3 align="right">total for ',$sg,'</td>
+		<td bgcolor="#e0e0e0" align="right">',$dur,'</td>
+		<td><small>in ',$sg_count->{$sg},' failures</small></td>
+		</tr>';
 }
 
-print end_table;
+print "</table>",
+	$q->end_html;
+