xmltv/grab/fi/fi programme.pm,2.08,2.09

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

Modified Files:
	programme.pm 
Log Message:
- test.sh: add check for Perl warnings
- programme.pm: fix Perl warnings


Index: programme.pm
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/fi/fi/programme.pm,v
retrieving revision 2.08
retrieving revision 2.09
diff -C2 -d -r2.08 -r2.09
*** programme.pm	20 Nov 2015 20:19:21 -0000	2.08
--- programme.pm	6 Dec 2015 13:43:07 -0000	2.09
***************
*** 219,223 ****
    #   description: Amerikkalainen animaatiosarja....
    #
!   elsif ((defined $description)               &&
  	 (exists $series_description{$title}) &&
  	 (($left, $special, $right) = ($description =~ $match_description))) {
--- 219,223 ----
    #   description: Amerikkalainen animaatiosarja....
    #
!   elsif ((defined($description))              &&
  	 (exists $series_description{$title}) &&
  	 (($left, $special, $right) = ($description =~ $match_description))) {
***************
*** 244,248 ****
  
      # Check for "Kausi <season>. Jakso <episode>/<# of episodes>. <sub-title>...."
!     } elsif (my($desc_season, $desc_episode, $remainder) =
  	($description =~ m,^Kausi\s+(\d+)\.\s+Jakso\s+(\d+)(?:/\d+)?\.\s*(.*)$,)) {
  	$season  = $desc_season;
--- 244,248 ----
  
      # Check for "Kausi <season>. Jakso <episode>/<# of episodes>. <sub-title>...."
!     } elsif (($desc_season, $desc_episode, $remainder) =
  	($description =~ m,^Kausi\s+(\d+)\.\s+Jakso\s+(\d+)(?:/\d+)?\.\s*(.*)$,)) {
  	$season  = $desc_season;
***************
*** 272,287 ****
  	undef $special;
      }
!     unless (defined $special) {
!       # We only remove period from episode title, preserve others
!       $left =~ s/\.$//;
!     } elsif (($left    !~ /\.$/) &&
! 	     ($special =~ /^\.\s/)) {
!       # Ignore extraneous period after sentence
!     } else {
!       # Preserve others, e.g. ellipsis
!       $special =~ s/\s+$//;
!       $left    .= $special;
      }
-     debug(3, "XMLTV series title '$title' episode '$left'");
      ($subtitle, $description) = ($left, $right);
    }
--- 272,289 ----
  	undef $special;
      }
!     if (defined($left)) {
! 	unless (defined($special)) {
! 	    # We only remove period from episode title, preserve others
! 	    $left =~ s/\.$//;
! 	} elsif (($left    !~ /\.$/) &&
! 		 ($special =~ /^\.\s/)) {
! 	    # Ignore extraneous period after sentence
! 	} else {
! 	    # Preserve others, e.g. ellipsis
! 	    $special =~ s/\s+$//;
! 	    $left    .= $special;
! 	}
! 	debug(3, "XMLTV series title '$title' episode '$left'");
      }
      ($subtitle, $description) = ($left, $right);
    }


------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140