xmltv/grab/fi/fi programme.pm,2.05,2.06

Update of /cvsroot/xmltv/xmltv/grab/fi/fi
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25019/grab/fi/fi

Modified Files:
	programme.pm 
Log Message:
- http://tv.hs.fi/ is nowadays redirected to http://www.iltapulu.fi/
- renamed tvhs.pm to iltapulu.pm
- updated iltapulu.pm for the HTML changes
- test.conf: updated with latest full channel list
- programme: add another season/episode extraction method


Index: programme.pm
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/fi/fi/programme.pm,v
retrieving revision 2.05
retrieving revision 2.06
diff -C2 -d -r2.05 -r2.06
*** programme.pm	21 Oct 2014 19:25:01 -0000	2.05
--- programme.pm	23 Feb 2015 18:05:08 -0000	2.06
***************
*** 125,128 ****
--- 125,132 ----
  my $title_strip_parental;
  
+ # Common regular expressions
+ # ($left, $special, $right) = ($description =~ $match_description)
+ my $match_description = qr/^\s*([^.!?]+[.!?])([.!?]+\s+)?\s*(.*)/;
+ 
  sub dump {
    my($self, $writer) = @_;
***************
*** 217,221 ****
    elsif ((defined $description)               &&
  	 (exists $series_description{$title}) &&
! 	 (($left, $special, $right) = ($description =~ /^\s*([^.!?]+[.!?])([.!?]+\s+)?\s*(.*)/))) {
      # Check for "Kausi <season>. Jakso <episode>/<# of episodes>. <sub-title>...."
      if (my($desc_season, $desc_episode, $remainder) =
--- 221,225 ----
    elsif ((defined $description)               &&
  	 (exists $series_description{$title}) &&
! 	 (($left, $special, $right) = ($description =~ $match_description))) {
      # Check for "Kausi <season>. Jakso <episode>/<# of episodes>. <sub-title>...."
      if (my($desc_season, $desc_episode, $remainder) =
***************
*** 225,229 ****
  
  	# Repeat the above match on remaining description
! 	($left, $special, $right) = ($remainder =~ /^\s*([^.!?]+[.!?])([.!?]+\s+)?\s*(.*)/);
      }
      unless (defined $special) {
--- 229,242 ----
  
  	# Repeat the above match on remaining description
! 	($left, $special, $right) = ($remainder =~ $match_description);
! 
!     # Check for "Kausi <season>, <episode>/<# of episodes>. <sub-title>...."
!     } elsif (($desc_season, $desc_episode, $remainder) =
! 	($description =~ m!^Kausi\s+(\d+),\s+(\d+)(?:/\d+)?\.\s*(.*)$!)) {
! 	$season  = $desc_season;
! 	$episode = $desc_episode;
! 
! 	# Repeat the above match on remaining description
! 	($left, $special, $right) = ($remainder =~ $match_description);
      }
      unless (defined $special) {


------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk