Changeset 31434 for branches/czw_branch/20110406/tools/czartool/Nebulous.pm

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• tools/czartool/Nebulous.pm (modified) (1 diff)

branches/czw_branch/20110406/tools/czartool/Nebulous.pm

@@ -110 +110 @@
             next;
         }
-        elsif ($line =~ m/(ipp[0-9]+)\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i) {
+        elsif (($line =~ m/(ipp[0-9]+)\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
+               ($line =~ m/(ippb[0-9]+)\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) {
         
             $self->{_totalHosts}++;