===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- nagios/check_hw_sensors/check_hw_sensors	2006/05/02 20:59:47	1.6
+++ nagios/check_hw_sensors/check_hw_sensors	2006/05/02 22:23:29	1.8
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: check_hw_sensors,v 1.5 2006/05/02 19:49:29 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.7 2006/05/02 20:03:53 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD hw.sensors
 # 
@@ -65,7 +65,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.6 $ ');
+	print_revision($PROGNAME,'$Revision: 1.8 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -155,21 +155,14 @@
 		$state = $error;
 	}
 }
-if (NAGIOS_OUTPUT && $have_results) {
-	print '<ul>';
-}
 foreach my $error (sort { $ERRORS{$b} <=> $ERRORS{$a} } keys %ERRORS) {
 	if (exists $states{$error}) {
 		if (NAGIOS_OUTPUT) {
-			print "<li>$error (" . scalar(@{ $states{ $error } }) . ")";
+			print "$error (" . scalar(@{ $states{ $error } }) . ")";
 			unless ($error eq 'OK') {
-				print '<ul>';
-				foreach (@{ $states{ $error } }) {
-					print "<li>$_</li>";
-				}
-				print '</ul>';
+				print '<br />';
+				print map { " - $_<br />" } @{ $states{ $error } };
 			}
-			print "</li>"
 		} else {
 			print "$error (" . scalar(@{ $states{ $error } }) . "):\n";
 			foreach (@{ $states{ $error } }) {
@@ -181,9 +174,6 @@
 if ($have_results == 0) {
 	print "No results found\n";
 }
-if (NAGIOS_OUTPUT && $have_results) {
-	print '</ul>' . "\n";
-}
 exit $ERRORS{$state};
 
 
@@ -308,7 +298,7 @@
 				foreach my $c (@{ $check->{$code} }) {
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 						      ") for '$sensor->{'id'}:$code'";
 						next;
 					}
@@ -386,7 +376,7 @@
 
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 							 ") for '$sensor->{'id'}':$code";
 						next;
 					}
@@ -454,6 +444,6 @@
 
 EOL
 	
-	print_revision($PROGNAME, '$Revision: 1.6 $');
+	print_revision($PROGNAME, '$Revision: 1.8 $');
 }