xmltv/grab/uk_tvguide tv_grab_uk_tvguide,1.10,1.11
Geoff <[email protected]>
| Newsgroups | gmane.comp.tv.xmltv.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xmltv/xmltv/grab/uk_tvguide
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8130
Modified Files:
tv_grab_uk_tvguide
Log Message:
(minor) fix an issue with character encodings
Index: tv_grab_uk_tvguide
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_tvguide/tv_grab_uk_tvguide,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tv_grab_uk_tvguide 21 Jan 2014 11:03:30 -0000 1.10
--- tv_grab_uk_tvguide 23 Jan 2014 13:12:03 -0000 1.11
***************
*** 273,277 ****
if ($showdirector->as_text) {
foreach ( split(', ', $showdirector->as_text) ) {
! push @{$prog{'credits'}{'director'}}, $_;
}
}
--- 273,277 ----
if ($showdirector->as_text) {
foreach ( split(', ', $showdirector->as_text) ) {
! push @{$prog{'credits'}{'director'}}, encode('utf-8', $_);
}
}
***************
*** 288,292 ****
if ($showproducer->as_text) {
foreach ( split(', ', $showproducer->as_text) ) {
! push @{$prog{'credits'}{'producer'}}, $_;
}
}
--- 288,292 ----
if ($showproducer->as_text) {
foreach ( split(', ', $showproducer->as_text) ) {
! push @{$prog{'credits'}{'producer'}}, encode('utf-8', $_);
}
}
***************
*** 301,305 ****
if ($showproducer->as_text) {
foreach ( split(', ', $showproducer->as_text) ) {
! push @{$prog{'credits'}{'producer'}}, $_;
}
}
--- 301,305 ----
if ($showproducer->as_text) {
foreach ( split(', ', $showproducer->as_text) ) {
! push @{$prog{'credits'}{'producer'}}, encode('utf-8', $_);
}
}
***************
*** 317,321 ****
if ($showwriter->as_text) {
foreach ( split(', ', $showwriter->as_text) ) {
! push @{$prog{'credits'}{'writer'}}, $_;
}
}
--- 317,321 ----
if ($showwriter->as_text) {
foreach ( split(', ', $showwriter->as_text) ) {
! push @{$prog{'credits'}{'writer'}}, encode('utf-8', $_);
}
}
***************
*** 343,347 ****
foreach my $showactor (@showactors) {
if ($showactor->as_text ne '(IMDB)') { # ignore IMDB link spans
! push @{$prog{'credits'}{'actor'}}, $showactor->as_text;
}
}
--- 343,347 ----
foreach my $showactor (@showactors) {
if ($showactor->as_text ne '(IMDB)') { # ignore IMDB link spans
! push @{$prog{'credits'}{'actor'}}, encode('utf-8', $showactor->as_text);
}
}
***************
*** 424,428 ****
# <span class="programmeheading">Baywatch</span>
my $showtitle = $show->look_down('_tag' => 'span', 'class' => 'programmeheading');
! $prog{'title'} = [[ encode( 'utf-8', decode( 'windows-1255', $showtitle->as_text)), 'en' ]];
$showtitle->detach;
--- 424,428 ----
# <span class="programmeheading">Baywatch</span>
my $showtitle = $show->look_down('_tag' => 'span', 'class' => 'programmeheading');
! $prog{'title'} = [[ encode('utf-8', $showtitle->as_text), 'en' ]];
$showtitle->detach;
***************
*** 463,467 ****
}
foreach my $category (@showcategories) {
! push @{$prog{'category'}}, [ $category, 'en' ];
}
$showcategory->left->detach;
--- 463,467 ----
}
foreach my $category (@showcategories) {
! push @{$prog{'category'}}, [ encode('utf-8', $category), 'en' ];
}
$showcategory->left->detach;
***************
*** 475,479 ****
$showdesc .= '.' if ( (length $showdesc) && (substr $showdesc,-1,1 ne '.') ); # addend a fullstop
if (length $showdesc) {
! $prog{'desc'} = [[ encode( 'utf-8', decode( 'windows-1255', $showdesc)), 'en' ]];
}
}
--- 475,479 ----
$showdesc .= '.' if ( (length $showdesc) && (substr $showdesc,-1,1 ne '.') ); # addend a fullstop
if (length $showdesc) {
! $prog{'desc'} = [[ encode('utf-8', $showdesc), 'en' ]];
}
}
***************
*** 539,543 ****
my $showeptitle = $show->look_down('_tag' => 'span', 'class' => 'tvchannel');
if ($showeptitle) {
! $prog{'sub-title'} = [[ encode( 'utf-8', decode( 'windows-1255', $showeptitle->as_text)), 'en' ]];
$showeptitle->detach;
}
--- 539,543 ----
my $showeptitle = $show->look_down('_tag' => 'span', 'class' => 'tvchannel');
if ($showeptitle) {
! $prog{'sub-title'} = [[ encode('utf-8', $showeptitle->as_text), 'en' ]];
$showeptitle->detach;
}
***************
*** 552,555 ****
--- 552,556 ----
$directors =~ s/ (singer|actor|actress) //ig; # strip these words
$directors =~ s/,,/,/g; # delete empties
+ $directors = encode('utf-8', $directors); # encode names into utf-8
#debug $directors;
my @directors = split(/,/, $directors);
***************
*** 569,572 ****
--- 570,574 ----
$actors =~ s/ (singer|actor|actress) //ig; # strip these words
$actors =~ s/,,/,/g; # delete empties
+ $actors = encode('utf-8', $actors); # encode names into utf-8
#debug $actors;
my @actors = split(/,/, $actors);
***************
*** 754,758 ****
$channels->{"$id"} = {
id => "$id",
! 'display-name' => [[ encode( 'utf-8', decode( 'windows-1255', $name)), 'en' ]],
url => [ $ROOT_URL.$url ]
};
--- 756,760 ----
$channels->{"$id"} = {
id => "$id",
! 'display-name' => [[ encode('utf-8', $name), 'en' ]],
url => [ $ROOT_URL.$url ]
};
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk