[Devmon-devel] SF.net SVN: devmon:[153] trunk/modules/dm_tests.pm

[<dba...@us...>]

Revision: 153
          http://devmon.svn.sourceforge.net/devmon/?rev=153&view=rev
Author:   dbaldwin
Date:     2009-09-23 04:53:49 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
Handle leaf data in tables correctly in dm_tests.pm

Modified Paths:
--------------
    trunk/modules/dm_tests.pm

Modified: trunk/modules/dm_tests.pm
===================================================================
--- trunk/modules/dm_tests.pm	2009-09-23 01:39:50 UTC (rev 152)
+++ trunk/modules/dm_tests.pm	2009-09-23 04:53:49 UTC (rev 153)
@@ -1874,8 +1874,8 @@
             my $oid_h = \%{$oids->{$oid}};
 
            # Get our oid vars
-            my $val   = $oid_h->{'val'}{$leaf};
-            my $color = $oid_h->{'color'}{$leaf};
+            my $val   = $oid_h->{'repeat'} ? $oid_h->{'val'}{$leaf} : $oid_h->{'val'};
+            my $color = $oid_h->{'repeat'} ? $oid_h->{'color'}{$leaf} : $oid_h->{'color'};
             if (!defined $val) {
               do_log("Undefined value for $oid in test $test on $device, ignoring row for $pri_val") if $g{'debug'};
             next T_LEAF;
@@ -1981,7 +1981,7 @@
 
            # Otherwise just display the oid val
             else {
-              my $substr = $oids->{$root}{'val'}{$leaf};
+              my $substr = $oids->{$root}{'repeat'} ? $oids->{$root}{'val'}{$leaf} : $oids->{$root}{'val'};
               $substr = 'Undefined' if !defined $substr;
               $row_data =~ s/\{$root}/$substr/;
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.