r3582 - in vdr/vdr-xxv/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-10-20 16:20:01 +0000 (Fri, 20 Oct 2006)
New Revision: 3582

Added:
   vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch
Modified:
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/patches/00list
Log:
Added 10_RECORDS-missing-same-title.dpatch


Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2006-10-19 21:18:22 UTC (rev 3581)
+++ vdr/vdr-xxv/trunk/debian/changelog	2006-10-20 16:20:01 UTC (rev 3582)
@@ -1,3 +1,9 @@
+vdr-xxv (0.80-3) unstable; urgency=low
+
+  * Added 10_RECORDS-missing-same-title.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 20 Oct 2006 18:19:29 +0200
+
 vdr-xxv (0.80-2) unstable; urgency=low
 
   * Disabled restart command, because xxv does not run as root and therefore

Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list	2006-10-19 21:18:22 UTC (rev 3581)
+++ vdr/vdr-xxv/trunk/debian/patches/00list	2006-10-20 16:20:01 UTC (rev 3582)
@@ -1,3 +1,5 @@
 01_libpath
 02_disable-restart
 03_defaults
+
+10_RECORDS-missing-same-title

Added: vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch	                        (rev 0)
+++ vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch	2006-10-20 16:20:01 UTC (rev 3582)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_RECORDS-missing-same-title.dpatch by Andreas Brachold <vdr04 at deltab.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes Bug in RECORDS module, causing recordings with the same
+## DP: title to appear as a single recording.
+
+ at DPATCH@
+diff -urNad vdr-xxv-0.80~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.80/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.80~/lib/XXV/MODULES/RECORDS.pm	2006-10-20 18:17:13.000000000 +0200
++++ vdr-xxv-0.80/lib/XXV/MODULES/RECORDS.pm	2006-10-20 18:17:37.000000000 +0200
+@@ -223,7 +223,7 @@
+     # The Initprocess
+     my $erg = $self->init or return error('Problem to initialze Module');
+ 
+-    # Interval to read channels and put to DB
++    # Interval to read recordings and put to DB
+     Event->timer(
+         interval => $self->{interval},
+         prio => 6,  # -1 very hard ... 6 very low
+@@ -814,7 +814,7 @@
+     $title =~ s/%/\%/sg;
+ 
+     # Search in DB
+-    my $sql = "SELECT * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= '$start' and UNIX_TIMESTAMP(starttime+duration) <= '$bis' AND title = '$title'";
++    my $sql = "SELECT * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= '$start' and UNIX_TIMESTAMP(starttime)+duration <= '$bis' AND title = '$title'";
+     if($subtitle) {
+       my $st = $subtitle;
+       $st =~ s/\'/\\\'/g;