From eb64039db1dd9c1ddfbf2a34f3fe27757b525b01 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 29 Jan 2009 16:01:40 +0000
Subject: * rdisplay: transmit keywords as data * skins/jason: recordings show
 cutpoints * skins/jason: program list - allow programming multiple timer with
 'one' click

---
 html/rdisplay.tmpl          |  4 ++--
 lib/XXV/MODULES/KEYWORDS.pm |  5 +++--
 lib/XXV/MODULES/RECORDS.pm  | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/html/rdisplay.tmpl b/html/rdisplay.tmpl
index 122486e..0d8cebe 100644
--- a/html/rdisplay.tmpl
+++ b/html/rdisplay.tmpl
@@ -163,12 +163,12 @@
         </tr>
         <?% END %?>
         <?% allowkeywords = allow('rk') %?>
-        <?% IF param.keywords.size > 0 %?>
+        <?% IF data.keywords && data.keywords.size > 0 %?>
 				<tr>
           <td>&nbsp;</td>
 					<td>
                   <?% gettext('Keywords') %?>&nbsp;:&nbsp;
-                  <?% FOREACH keyword = param.keywords %?>
+                  <?% FOREACH keyword = data.keywords %?>
                       <?% IF allowkeywords %?>
                               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                       <?% END %?>
diff --git a/lib/XXV/MODULES/KEYWORDS.pm b/lib/XXV/MODULES/KEYWORDS.pm
index 71107d3..06d2942 100644
--- a/lib/XXV/MODULES/KEYWORDS.pm
+++ b/lib/XXV/MODULES/KEYWORDS.pm
@@ -238,9 +238,10 @@ sub list {
     my $keywordmax = $list->[0]->[1];
     my $keywordmin = $list->[-1]->[1];
     # sort keyworks by name
-    my @keywords = sort {$a->[0] cmp $b->[0]} @$list;
+    my $keywords;
+    @{$keywords} = sort {$a->[0] cmp $b->[0]} @$list;
 
-    return (\@keywords,$keywordmax,$keywordmin);
+    return ($keywords,$keywordmax,$keywordmin);
 }
 
 # ------------------
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index f235177..6004cc4 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -1763,11 +1763,13 @@ where
       $_ =~ s/\s*\:.*$//;
     } @reccmds;
 
-    my ($keywords,$keywordmax,$keywordmin) = $self->{keywords}->list('recording',[ $erg->{'id'} ]);
+    if($self->{keywords} && $self->{keywords}->{active} eq 'y') {
+      my ($keywords,$keywordmax,$keywordmin) = $self->{keywords}->list('recording',[ $id ]);
+      $erg->{'keywords'} = $keywords;
+    }
 
     my $param = {
-        reccmds => \@reccmds,
-        keywords => $keywords
+        reccmds => \@reccmds
     };
     $console->table($erg,$param);
 }
@@ -1910,7 +1912,7 @@ SELECT SQL_CACHE
     IF(COUNT(*)>1,0,1) as __IsRecording,
     e.description as __description,
     preview as __preview,
-    cutlength as __cutlength
+    SUM(cutlength) as __cutlength
 FROM
     RECORDS as r,
     OLDEPG as e
-- 
cgit v1.2.3