* KEYWORDS: Update routines

* xxvd: Ignore if contrib/update-xxv missed

4 files changed, 13 insertions, 6 deletions

diff --git a/bin/xxvd b/bin/xxvd
index 5de8905..2403533 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -469,8 +469,13 @@ sub getDBVersion {
     return $DBVERSION if($DBVERSION);
 
     my $cmd       = sprintf('%s/update-xxv', $PATHS->{CONTRIB});
-    my ($ver) = (`$cmd -v`)[-1] =~ /\'(\d+)\'/;
-    $DBVERSION = $ver;
+    if( -x $cmd) {
+      my ($ver) = (`$cmd -v`)[-1] =~ /\'(\d+)\'/;
+      $DBVERSION = $ver;
+    } else {
+      $DBVERSION = 31;
+      debug sprintf("File '%s' missed!, use database layout %d", $cmd, $DBVERSION);
+    }
     return $DBVERSION;
 }
 
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