diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-10-01 18:46:12 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-10-01 18:46:12 +0000 |
| commit | f4ab1f401f56c9658c252c1b40a7afcdb8878a11 (patch) | |
| tree | 3ee4c705aedfdad5323a93e2f9eaf3f448951802 /lib | |
| parent | 219310fdeb76a49b0d20e5d0855b6d097ee00339 (diff) | |
| download | xxv-f4ab1f401f56c9658c252c1b40a7afcdb8878a11.tar.gz xxv-f4ab1f401f56c9658c252c1b40a7afcdb8878a11.tar.bz2 | |
* locale : fix typo
* RECORDS: assign maybe event from wrong channel if none subtitle present
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/RECORDS.pm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm index 5352849..84ee767 100644 --- a/lib/XXV/MODULES/RECORDS.pm +++ b/lib/XXV/MODULES/RECORDS.pm @@ -1047,7 +1047,7 @@ sub SearchEpgId { my $bis = int($start + $dur); if($subtitle && $channel && $channel ne "") { $sth = $obj->{dbh}->prepare( -qq|SELECT SQL_CACHE * FROM OLDEPG WHERE +qq|SELECT SQL_CACHE * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= ? AND UNIX_TIMESTAMP(starttime)+duration <= ? AND title = ? @@ -1055,9 +1055,18 @@ qq|SELECT SQL_CACHE * FROM OLDEPG WHERE AND channel_id = ?|); $sth->execute($start,$bis,$title,$subtitle,$channel) or return error sprintf("Couldn't execute query: %s.",$sth->errstr); + } elsif($channel && $channel ne "") { + $sth = $obj->{dbh}->prepare( +qq|SELECT SQL_CACHE * FROM OLDEPG WHERE + UNIX_TIMESTAMP(starttime) >= ? + AND UNIX_TIMESTAMP(starttime)+duration <= ? + AND title = ? + AND channel_id = ?|); + $sth->execute($start,$bis,$title,$channel) + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } elsif($subtitle) { $sth = $obj->{dbh}->prepare( -qq|SELECT SQL_CACHE * FROM OLDEPG WHERE +qq|SELECT SQL_CACHE * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= ? AND UNIX_TIMESTAMP(starttime)+duration <= ? AND title = ? @@ -1066,7 +1075,7 @@ qq|SELECT SQL_CACHE * FROM OLDEPG WHERE or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { $sth = $obj->{dbh}->prepare( -qq|SELECT SQL_CACHE * FROM OLDEPG WHERE +qq|SELECT SQL_CACHE * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= ? AND UNIX_TIMESTAMP(starttime)+duration <= ? AND title = ?|); @@ -1076,13 +1085,7 @@ qq|SELECT SQL_CACHE * FROM OLDEPG WHERE return 0 if(!$sth); my $erg = $sth->fetchrow_hashref(); - return $erg - if($erg->{eventid} - and ( # check for equal subtitle - (not $subtitle and not $erg->{subtitle}) - or (($subtitle and $erg->{subtitle}) and ($subtitle eq $erg->{subtitle})) - ) - ); + return $erg; } # ------------------ |