Fixed parsing 'E' records

3 files changed, 9 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 93c1e058..a6581071 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -356,3 +356,6 @@ Sven Grothklags <sven@uni-paderborn.de>
 
 Tomas Prybil <tomas.prybil@copper.se>
  for translating OSD texts to the Swedish language
+
+Matthias Fechner <matthiasfechner@web.de>
+ for pointing out a bug in parsing 'E' records in epg2html.pl
diff --git a/HISTORY b/HISTORY
index f60228a8..35ec1f4f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -951,7 +951,7 @@ Video Disk Recorder Revision History
 - Changed the [dei]syslog macros in tools.h to use a variable number of args,
   thus making it safe to use them in nested 'if/else' statements.
 - Fixed error handling in establishing an SVDRP connection (thanks to Davide
-  Achilli) for pointing this out).
+  Achilli for pointing out this one).
 - The new configuration file 'svdrphosts.conf' is now used to define which
   hosts may access the SVDRP port (by default only 'localhost' has access).
   See FORMATS for details.
@@ -1188,7 +1188,7 @@ Video Disk Recorder Revision History
 - Now the EPG scan skips channels that have their 'Ca' parameter explicitly set
   to an other DVB card (suggested by Sergei Haller).
 - Fixed a possible hangup when reading a broken epg.data file (thanks to Henning
-  Holtschneider for pointing this one out).
+  Holtschneider for pointing out this one).
 - Fixed a bug in the editing process in case a previously edited file with the
   same name was manually deleted on a system with more than one video directory
   (thanks to Dirk Wiebel for reporting this one).
@@ -1317,3 +1317,5 @@ Video Disk Recorder Revision History
   See PLUGINS.html for details.
 - Moved the cEITScanner out of dvbapi.h/.c, into the new eitscan.h/.c.
 - Added Swedish language texts (thanks to Tomas Prybil).
+- Fixed parsing 'E' records in epg2html.pl (thanks to Matthias Fechner for pointing
+  out this one).
diff --git a/epg2html.pl b/epg2html.pl
index 80383ed3..6b7b8c94 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.3 2002/02/26 17:20:19 kls Exp $
+# $Id: epg2html.pl 1.4 2002/05/30 09:46:46 kls Exp $
 
 @Index = ();
 
@@ -45,7 +45,7 @@ while (<>) {
          push(@Index, qq{<a href="$Page">$Channel</a><br>\n});
          my %Events = ();
          while (<>) {
-               if (/^E (.*?) (.*?) (.*?)/) {
+               if (/^E (.*?) (.*?) ([^ ]*)/) {
                   (my $Time, $Duration) = ($2, $3);
                   my $Title = "", $Subtitle = "", $Description = "";
                   while (<>) {