summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-12-02 10:00:08 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-12-02 10:00:08 +0100
commitddcb37300faca0631f5cbd931f5174fe35c27e38 (patch)
treefd60e7b8714fc38875cb82fa733345d9af021237
parent83ad7bf6e49773b4cdeb265908ab6b921c12e4a3 (diff)
downloadvdr-ddcb37300faca0631f5cbd931f5174fe35c27e38.tar.gz
vdr-ddcb37300faca0631f5cbd931f5174fe35c27e38.tar.bz2
The getskyepg.pl script now replaces "&amp;" with "&"
-rw-r--r--HISTORY1
-rw-r--r--PLUGINS/src/sky/HISTORY3
-rwxr-xr-xPLUGINS/src/sky/getskyepg.pl11
3 files changed, 12 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 292bdff3..a68ce996 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4995,6 +4995,7 @@ Video Disk Recorder Revision History
If your version of 'wget' doesn't support the -U option to set the user agent,
use the new option -U of getskyepg.pl to have the information added to the URL
as a query string.
+- The getskyepg.pl script now replaces "&amp;" with "&".
- Fixed a possible crash in remux.c on 64-bit machines (thanks to Reinhard Nissl).
- Fixed a typo in the change to the "Use small font" setup option in version 1.3.47
in the HISTORY and CONTRIBUTORS file (reported by Andreas Brugger).
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index d40d3b03..3233bf62 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -46,10 +46,11 @@ VDR Plugin 'sky' Revision History
- Fixed format string handling.
-2006-12-01: Version 0.3.5 (version number not increased)
+2006-12-02: Version 0.3.5 (version number not increased)
- Made the getskyepg.pl script send a user agent message to
the server, according to the rules at http://bleb.org/tv/data/listings.
If your version of 'wget' doesn't support the -U option to set the user agent,
use the new option -U of getskyepg.pl to have the information added to the URL
as a query string.
+- The getskyepg.pl script now replaces "&amp;" with "&".
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index d5819811..6388caae 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
#
# See the README file for copyright information and how to reach the author.
#
-# $Id: getskyepg.pl 1.5 2006/12/01 14:38:00 kls Exp $
+# $Id: getskyepg.pl 1.6 2006/12/02 09:52:49 kls Exp $
use Getopt::Std;
use Time::Local;
@@ -95,6 +95,13 @@ sub GetPage
return @page;
}
+sub ReplaceTags
+{
+ my $s = shift;
+ $s =~ s/&amp;/&/g;
+ return $s;
+}
+
sub StripWhitespace
{
my $s = shift;
@@ -108,7 +115,7 @@ sub Extract
my $s = shift;
my $t = shift;
$s =~ /<$t>([^<]*)<\/$t>/;
- return StripWhitespace($1);
+ return ReplaceTags(StripWhitespace($1));
}
# In order to get the duration we need to buffer the last event: