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

[<buc...@us...>]

Revision: 240
          http://devmon.svn.sourceforge.net/devmon/?rev=240&view=rev
Author:   buchanmilne
Date:     2013-01-02 15:55:32 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Revert unintended changes to trans_index in r238 (thanks to Wim Nelis for spotting them)

Revision Links:
--------------
    http://devmon.svn.sourceforge.net/devmon/?rev=238&view=rev

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

Modified: trunk/modules/dm_tests.pm
===================================================================
--- trunk/modules/dm_tests.pm	2012-12-27 18:01:12 UTC (rev 239)
+++ trunk/modules/dm_tests.pm	2013-01-02 15:55:32 UTC (rev 240)
@@ -1621,9 +1621,6 @@
     my $oid_h = \%{$oids->{$oid}};
    # Extract our parent oids from the expression, first
     my ($src_oid) = $oid_h->{'trans_data'} =~ /\{(.+?)\}/g;
-    my ($oidregex) = $oid_h->{'trans_data'} =~ s/\{(.+?)\}//g;
-    $oidregex =~ s/^\s*//;
-    $oidregex =~ s/\s*$//;
     validate_deps($device, $oids, $oid, [$src_oid], '.+') ;
 
    # Validate our dependencies, have to do them seperately
@@ -1648,24 +1645,6 @@
        # Skip if our source oid is freaky-deaky
         next if $oid_h->{'error'}{$leaf};
 
-       # If we had a regex, skip this index if the value doesnt match
-        if ( $oidregex ne '' ) {
-	  my $res;
-	  my $val = $src_h->{'val'}{$leaf};
-          do_log("Testing value $val from against $oidregex",0) if $g{'debug'};
-          my $result = eval "\$res = \$val =~ m$oidregex";
-          if($@) {
-            do_log("Failed eval for REGSUB transform on leaf $leaf of " .
-                   "$oid on $device ($@)", 0);
-            $oid_h->{'val'}{$leaf}   = 'Failed eval';
-            $oid_h->{'time'}{$leaf}  = time;
-            $oid_h->{'color'}{$leaf} = 'yellow';
-            $oid_h->{'error'}{$leaf} = 1;
-            next;
-	  }
-	  next if $res;
-        }
-
        # Our oid sub leaf
        # my $oid_idx = $src_h->{'val'}{$leaf};
 

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