Modified: trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm 2013-02-01 14:09:02 UTC (rev 11316)
+++ trunk/opsview-core/lib/Opsview/Utils/NDOLogsImporter.pm 2013-02-01 14:55:21 UTC (rev 11317)
@@ -2481,7 +2481,7 @@
}
}
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLESTATUS(
$event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id, $event->[ NDO_DATA_TIMESTAMP() ]
@@ -2830,7 +2830,7 @@
}
}
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLESTATUS(
$event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id, $event->[ NDO_DATA_TIMESTAMP() ]
@@ -3232,7 +3232,7 @@
$sth_insert_handle_CONTACTSTATUSDATA->execute(@data);
}
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLESTATUS(
$event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id, $event->[ NDO_DATA_TIMESTAMP() ]
@@ -3850,7 +3850,7 @@
$host_id = $sth_insert_handle_HOSTDEFINITION->{mysql_insertid};
}
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLE( $event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id );
}
@@ -3858,17 +3858,17 @@
# XXX on update there is no host_id - how to set parent relationship?
next unless $host_id;
- if ( exists $event->[ NDO_DATA_PARENTHOST() ] ) {
+ if ( defined $event->[ NDO_DATA_PARENTHOST() ] ) {
handle_MULTI_PARENTHOST( $event->[ NDO_DATA_PARENTHOST() ],
$host_id );
}
- if ( exists $event->[ NDO_DATA_CONTACTGROUP() ] ) {
+ if ( defined $event->[ NDO_DATA_CONTACTGROUP() ] ) {
handle_MULTI_CONTACTGROUP( 'host',
$event->[ NDO_DATA_CONTACTGROUP() ], $host_id );
}
- if ( exists $event->[ NDO_DATA_CONTACT() ] ) {
+ if ( defined $event->[ NDO_DATA_CONTACT() ] ) {
handle_MULTI_CONTACT( 'host', $event->[ NDO_DATA_CONTACT() ],
$host_id );
}
@@ -4119,17 +4119,17 @@
$sth_insert_handle_SERVICEDEFINITION->{mysql_insertid};
}
- if ( exists $event->[ NDO_DATA_CONTACTGROUP() ] ) {
+ if ( defined $event->[ NDO_DATA_CONTACTGROUP() ] ) {
handle_MULTI_CONTACTGROUP( 'service',
$event->[ NDO_DATA_CONTACTGROUP() ], $service_id );
}
- if ( exists $event->[ NDO_DATA_CONTACT() ] ) {
+ if ( defined $event->[ NDO_DATA_CONTACT() ] ) {
handle_MULTI_CONTACT( 'service', $event->[ NDO_DATA_CONTACT() ],
$service_id );
}
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLE( $event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id );
}
@@ -4370,7 +4370,7 @@
$sth_insert_handle_TIMEPERIODDEFINITION->{mysql_insertid};
}
- if ( exists $event->[ NDO_DATA_TIMERANGE() ] ) {
+ if ( defined $event->[ NDO_DATA_TIMERANGE() ] ) {
handle_MULTI_TIMERANGE( $event->[ NDO_DATA_TIMERANGE() ],
$timeperiod_id );
}
@@ -4522,7 +4522,7 @@
# ignore host NDO_DATA_CONTACTNOTIFICATIONCOMMANDS
# ignore service NDO_DATA_CONTACTNOTIFICATIONCOMMANDS
- if ( exists $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
+ if ( defined $event->[ NDO_DATA_CUSTOMVARIABLE() ] ) {
handle_MULTI_CUSTOMVARIABLE( $event->[ NDO_DATA_CUSTOMVARIABLE() ],
$object_id );
}
@@ -4571,7 +4571,7 @@
my $group_id = $sth_insert_handle_HOSTGROUPDEFINITION->{mysql_insertid};
- if ( exists $event->[ NDO_DATA_HOSTGROUPMEMBER() ] ) {
+ if ( defined $event->[ NDO_DATA_HOSTGROUPMEMBER() ] ) {
handle_MULTI_GROUP_MEMBERS( 'host', NDO2DB_OBJECTTYPE_HOST(),
$event->[ NDO_DATA_HOSTGROUPMEMBER() ], $group_id );
}
@@ -4620,7 +4620,7 @@
my $group_id =
$sth_insert_handle_CONTACTGROUPDEFINITION->{mysql_insertid};
- if ( exists $event->[ NDO_DATA_CONTACTGROUPMEMBER() ] ) {
+ if ( defined $event->[ NDO_DATA_CONTACTGROUPMEMBER() ] ) {
handle_MULTI_GROUP_MEMBERS(
'contact',
NDO2DB_OBJECTTYPE_CONTACT(),
@@ -4740,7 +4740,7 @@
my $group_id = $sth_insert->{mysql_insertid};
- if ( exists $event->[ NDO_DATA_SERVICEGROUPMEMBER() ] ) {
+ if ( defined $event->[ NDO_DATA_SERVICEGROUPMEMBER() ] ) {
handle_MULTI_GROUP_MEMBERS('service', NDO2DB_OBJECTTYPE_SERVICE(), $event->[ NDO_DATA_SERVICEGROUPMEMBER() ], $group_id);
}
}