From: hadaq <hadaq>
Date: Thu, 15 Nov 2012 00:17:57 +0000 (+0000)
Subject: removed bug, that lines with # were ignored, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=10c22342e932aa7b50b161a24f8ecc0210e37162;p=daqtools.git

removed bug, that lines with # were ignored, mt
---

diff --git a/merge_serial_address.pl b/merge_serial_address.pl
index c8a5d87..8684ecd 100755
--- a/merge_serial_address.pl
+++ b/merge_serial_address.pl
@@ -21,8 +21,9 @@ trb_init_ports() or die trb_strerror();
 
 my %trb;
 foreach my $cur_ln (<$fh1>) {
-    next if($cur_ln =~ /\s*#/ or $cur_ln =~ /^\s*$/);
+    next if($cur_ln =~ /^\s*#/ or $cur_ln =~ /^\s*$/);
     (my $serial_nr, my $uid) = $cur_ln =~ /(\d+)\s+(\w+)/;
+    next if (!defined $serial_nr);
     $serial_nr = int($serial_nr);
     $trb{$serial_nr}->{'uid'} = $uid;
 }
@@ -30,9 +31,10 @@ foreach my $cur_ln (<$fh1>) {
 #print Dumper \%trb;
 
 foreach my $cur_ln (<$fh2>) {
-    next if($cur_ln =~ /\s*#/ or $cur_ln =~ /^\s*$/);
+    next if($cur_ln =~ /^\s*#/ or $cur_ln =~ /^\s*$/);
     (my $address, my $sernr1, my $sernr2) = $cur_ln =~ /(\w+)\s+(\d+)\s+(\d+)/;
     my $serial_nr = $sernr1*10 + $sernr2;
+    next if (!defined $serial_nr);
     $trb{$serial_nr}->{'address'} = hex($address);
     $trb{$serial_nr}->{'endpoint_nr'} = $sernr2;
 }