diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-07-28 15:33:47 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-07-28 15:33:47 +0000 |
| commit | 4b91bd9831af2f70a077918ab8bba4dc3d13c09c (patch) | |
| tree | 514e95151eb4e907d04768019921f05eb5e756cb /lib | |
| parent | 28016bfd650f2d46dc60e9d023b02ee1b010e545 (diff) | |
| download | xxv-4b91bd9831af2f70a077918ab8bba4dc3d13c09c.tar.gz xxv-4b91bd9831af2f70a077918ab8bba4dc3d13c09c.tar.bz2 | |
* TIMERS: Use regular expressions to compare transponder source to detect collision like '(S19.2E|S13.0),T'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/TIMERS.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index f6caccf..a0d16a7 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -1652,7 +1652,7 @@ sub findOverlapping { # read from svdrp foreach my $vid (@$hostlist) { my $cards = $self->{svdrp}->cards($vid); - my @DVBCARDS = split(',',$cards); + my @DVBCARDS = split(/[,;\r\n]/,$cards); my $cardid = 1; foreach my $source (@DVBCARDS) { $source =~ s/^\s+//; # no leading white space @@ -1721,9 +1721,10 @@ ORDER BY $CardOnly = $1; } for my $ca (@{$CARDS}) { + my $source = $ca->{Source}; if(!($ti->[fCardUsed]) # If'nt assign && $ca->{VDR} eq $ti->[fVDR] # Same host - && $ca->{Source} eq $ti->[fSource] # Same source + && $ti->[fSource] =~ /$source/ # Same source && (!$CardOnly || $ca->{cardID} == $CardOnly) # if CA has DVB Card number && (!$ca->{tid} # Unused transponder || $ca->{tid} eq $ti->[fTID] # or same transponder |