===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- nagios/check_hw_sensors/check_hw_sensors	2006/05/02 21:03:53	1.7
+++ nagios/check_hw_sensors/check_hw_sensors	2006/05/03 03:26:47	1.9
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: check_hw_sensors,v 1.6 2006/05/02 19:59:47 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.8 2006/05/02 21:23:29 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD hw.sensors
 # 
@@ -65,7 +65,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.7 $ ');
+	print_revision($PROGNAME,'$Revision: 1.9 $ ');
 	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};
 
 
@@ -303,7 +293,7 @@
 					$result = $errors{$code} 
 						if ($c <= $data);
 				}
-			} elsif (defined $check->{$code}) {
+			} elsif (@{ $check->{$code} }) {
 				my $matched = 0;
 				foreach my $c (@{ $check->{$code} }) {
 					$c =~ s/[^\d\.]//g;
@@ -371,7 +361,7 @@
 					$result = $errors{$code} 
 						if ($c <= $data);
 				}
-			} elsif (defined $check->{$code}) {
+			} elsif (@{ $check->{$code} }) {
 
 				my $matched = 0;
 				foreach my $c (@{ $check->{$code} }) {
@@ -403,7 +393,7 @@
 			$sensor->{'type'} eq 'drive' ||
 			$sensor->{'type'} eq 'indicator'
 		) {
-			if (defined $check->{$code}) {
+			if (@{ $check->{$code} }) {
 				my $matched = 0;
 				foreach (@{ $check->{$code} }) {
 					if ($_ eq $sensor->{'data'}) {
@@ -454,6 +444,6 @@
 
 EOL
 	
-	print_revision($PROGNAME, '$Revision: 1.7 $');
+	print_revision($PROGNAME, '$Revision: 1.9 $');
 }