From 2731255c0cabc52896eece32f8d054d199aef1c6 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Mon, 9 Aug 2010 20:22:10 +0200
Subject: Don't ignore unknown fields

---
 bin/icli    | 22 ++++++++++++++--------
 t/50-icli.t |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/icli b/bin/icli
index 1716fed..ee07793 100755
--- a/bin/icli
+++ b/bin/icli
@@ -54,27 +54,33 @@ sub read_objects_line {
 		$cache->{$+{key}} = $+{value};
 	}
 	elsif ($line =~ / ^ \t } $ /x) {
-		given($context) {
-			when(['info', 'programstatus']) {
+		given ($context) {
+			when (['info', 'programstatus']) {
 				${$ref}->{$context} = $cache;
 			}
-			when('hoststatus') {
+			when ('hoststatus') {
 				${$ref}->{hosts}->{$cache->{host_name}} = $cache;
 			}
-			when('servicestatus') {
+			when ('servicestatus') {
 				push(@{${$ref}->{services}->{$cache->{host_name}}}, $cache);
 			}
-			when('contactstatus') {
+			when ('contactstatus') {
 				push(@{${$ref}->{contacts}}, $cache);
 			}
-			when('hostgroup') {
+			when ('hostgroup') {
 				${$ref}->{hostgroups}->{$cache->{hostgroup_name}} = $cache;
 			}
-			when([qw[timeperiod command contactgroup contact host service]]) {
+			when ('hostcomment') {
+				# TODO
+			}
+			when ('servicecomment') {
+				# TODO
+			}
+			when ([qw[timeperiod command contactgroup contact host service]]) {
 				# skipped for now
 			}
 			default {
-				die("Unknown field in $status_file: $context\n");
+				warn("Unknown field in $status_file: $context\n");
 			}
 		}
 		$cache = undef;
diff --git a/t/50-icli.t b/t/50-icli.t
index 2ab76e4..29702ab 100644
--- a/t/50-icli.t
+++ b/t/50-icli.t
@@ -110,7 +110,7 @@ $cmd->stderr_is_eq("See perldoc -F bin/icli\n");
 $icli = "bin/icli -f t/in/status.dat.weird.1 -c t/in/objects.cache";
 
 $cmd = Test::Command->new(cmd => $icli);
-$cmd->exit_isnt_num(0);
+$cmd->exit_is_num(0);
 $cmd->stdout_is_eq($EMPTY);
 $cmd->stderr_is_eq("Unknown field in t/in/status.dat.weird.1: bork\n");
 
-- 
cgit v1.2.3