diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2009-05-18 18:10:13 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2009-05-18 18:10:13 +0000 |
| commit | 167479bbec32232317b5e09eb8aaa64ab83a170b (patch) | |
| tree | 3c6dee2dc9420688f390282fd21b6245f7a17d55 /lib | |
| parent | 4d1e1cad949a407e1e231ac723bbc1e3444dae36 (diff) | |
| download | xxv-167479bbec32232317b5e09eb8aaa64ab83a170b.tar.gz xxv-167479bbec32232317b5e09eb8aaa64ab83a170b.tar.bz2 | |
* KEYWORDS: Update routines
* xxvd: Ignore if contrib/update-xxv missed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/AUTOTIMER.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/MODULES/KEYWORDS.pm | 6 | ||||
| -rw-r--r-- | lib/XXV/MODULES/TIMERS.pm | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm index 689e263..c7170e8 100644 --- a/lib/XXV/MODULES/AUTOTIMER.pm +++ b/lib/XXV/MODULES/AUTOTIMER.pm @@ -480,13 +480,13 @@ sub _autotimerLookup { my $keywords; ($event->{file},$keywords) = $obj->_placeholder($event, $a); + $event->{keywords} = $keywords if($keywords && $obj->{keywords}->{active} eq 'y'); # Add anchor for reidentify timer my $args = { 'autotimer' => $id, # 'eventid' => $eventid }; - $args->{'keywords'} = $keywords if($keywords && $obj->{keywords}->{active} eq 'y'); $event->{aux} = $obj->{keywords}->createxml($args); # Wished timer already exist with same data from autotimer ? diff --git a/lib/XXV/MODULES/KEYWORDS.pm b/lib/XXV/MODULES/KEYWORDS.pm index 06d2942..7eb2529 100644 --- a/lib/XXV/MODULES/KEYWORDS.pm +++ b/lib/XXV/MODULES/KEYWORDS.pm @@ -288,7 +288,7 @@ sub timer_keywords { my $tmod = main::getModule('TIMERS'); unless($text) { - return $tmod->list($console); + return $tmod->list($console,$config); } my $term; @@ -297,7 +297,7 @@ sub timer_keywords { $search = sprintf('AND ( %s ) AND ( t.id = k.hash )', $query->{query}); foreach(@{$query->{term}}) { push(@{$term},$_); } - return $tmod->_list($console,$search,$term,$params,', KEYWORDS as k'); + return $tmod->_list($console,$config,$search,$term,$params,', KEYWORDS as k'); } # ------------------ @@ -315,7 +315,7 @@ sub recording_keywords { } my $query = buildsearch("k.keyword",$text); - return $rmod->_search($console,$query->{query}.' ) AND ( r.hash = k.hash ',$query->{term},$params,', KEYWORDS as k'); + return $rmod->_search($console,$config,$query->{query}.' ) AND ( r.hash = k.hash ',$query->{term},$params,', KEYWORDS as k'); } # ------------------ diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index 61dd7a3..561a025 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -1234,6 +1234,7 @@ sub _list { my $search = shift || ''; my $term = shift; my $params = shift; + my $tables = shift || ''; my %f = ( 'id' => gettext('Service'), @@ -1271,6 +1272,7 @@ FROM TIMERS as t, CHANNELS as c, RECORDER as r + $tables WHERE t.stoptime > NOW() AND t.channel = c.id |