xmltv/grab/it tv_grab_it.in,1.103,1.104

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

Modified Files:
	tv_grab_it.in 
Log Message:
(mediaset_guidatv) - add sub-title
- fix not clearing data between programmes

Index: tv_grab_it.in
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/it/tv_grab_it.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** tv_grab_it.in	9 Oct 2014 14:17:58 -0000	1.103
--- tv_grab_it.in	10 Oct 2014 09:49:18 -0000	1.104
***************
*** 3226,3236 ****
  #               warn "|$1|$2|$3|$4|$5|\n";
  		my @lines = split /<evento/, $pr;
- 		my %programme = ();
-                 my ($title, $time_start, $time_end, $guidatv_channel_num, $rerun, $first, $id, $anno, $nazione,
-                     $desc, $epnum, $subtitle, $category, $rating, $audio, $doppioaudio, $sottotitoli);
  		my $lastline;
                  foreach my $l(@lines) {
  			next unless $l=~/<channel>$channel_num<\/channel>/;
  #                        next if ($l=~/anno\/|paese\/|linkScheda|trafficLight\/|orafine|\!--sort|\!-- canale|\/durata|\/prg|\/canale|\/giorno|\/palinsesto/);
  #                        if ($l=~/<title><\!\[CDATA\[(.*?)\]\]<\/title>/){
                          if ($l=~/<displayTitle><!\[CDATA\[(.*?)\]\]><\/displayTitle>/){
--- 3226,3238 ----
  #               warn "|$1|$2|$3|$4|$5|\n";
  		my @lines = split /<evento/, $pr;
  		my $lastline;
                  foreach my $l(@lines) {
  			next unless $l=~/<channel>$channel_num<\/channel>/;
  #                        next if ($l=~/anno\/|paese\/|linkScheda|trafficLight\/|orafine|\!--sort|\!-- canale|\/durata|\/prg|\/canale|\/giorno|\/palinsesto/);
+ 
+                          my %programme = ();
+                          my ($title, $time_start, $time_end, $guidatv_channel_num, $rerun, $first, $id, $anno, $nazione,
+                              $desc, $epnum, $subtitle, $category, $rating, $audio, $doppioaudio, $sottotitoli);
+ 		    
  #                        if ($l=~/<title><\!\[CDATA\[(.*?)\]\]<\/title>/){
                          if ($l=~/<displayTitle><!\[CDATA\[(.*?)\]\]><\/displayTitle>/){
***************
*** 3240,3243 ****
--- 3242,3247 ----
  			if ($l=~/<title><!\[CDATA\[(.*?)\]\]><\/title>/){
                                  $subtitle=$1;
+                                 $subtitle =~ s/[ -]*\Q$title\E[ -]*//;	# remove title from subtitle
+                                 undef $subtitle if lc($subtitle) eq lc($title);	# kill subtitle if the same as title
  #                                warn "sottotitolo: $subtitle\n";
                          }
***************
*** 3301,3305 ****
                  	$programme{category}=[[tidy($category), $LANG ]] if (defined $category and $category ne '');
  
! 	                #$programme{'sub-title'}=[[$subtitle, $LANG] ] if (defined $subtitle and $subtitle ne '');
          	        #push@{$programme->{'episode-num'}}, [$strseason, 'onscreen'] if ($strseason);
                  	#push@{$programme->{'episode-num'}}, [(defined $season ? ($season-1) : '').".".(defined $episode ? ($episode-1) : '').".0/1", 'xmltv_ns'] if ($strseason);  
--- 3305,3309 ----
                  	$programme{category}=[[tidy($category), $LANG ]] if (defined $category and $category ne '');
  
! 	                $programme{'sub-title'}=[[$subtitle, $LANG] ] if (defined $subtitle and $subtitle ne '');
          	        #push@{$programme->{'episode-num'}}, [$strseason, 'onscreen'] if ($strseason);
                  	#push@{$programme->{'episode-num'}}, [(defined $season ? ($season-1) : '').".".(defined $episode ? ($episode-1) : '').".0/1", 'xmltv_ns'] if ($strseason);  
***************
*** 3311,3319 ****
  	                push @programmes, {%programme};
  
! 
!         	        }
!                 next unless $title;
! 
! 
  	}
  
--- 3315,3319 ----
  	                push @programmes, {%programme};
  
!         	}
  	}
  


------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk