xmltv/lib IMDB.pm,1.64,1.65

Update of /cvsroot/xmltv/xmltv/lib
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29756/lib

Modified Files:
	IMDB.pm 
Log Message:
apply patch 94 and 95, add msg when keywords or plots not used

Index: IMDB.pm
===================================================================
RCS file: /cvsroot/xmltv/xmltv/lib/IMDB.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** IMDB.pm	18 May 2014 11:18:41 -0000	1.64
--- IMDB.pm	21 Feb 2015 04:59:17 -0000	1.65
***************
*** 573,576 ****
--- 573,577 ----
  
      push(@titles, $title);
+     
      # try the & -> and conversion
      if ( $title=~m/\&/o ) {
***************
*** 590,594 ****
  
      # try the "Columbo: Columbo cries Wolf" -> "Columbo cries Wolf" conversion
!     foreach (@titles) {
          if ( m/^[^:]+:.+$/io ) {
  	    my $t=$_;
--- 591,596 ----
  
      # try the "Columbo: Columbo cries Wolf" -> "Columbo cries Wolf" conversion
!     my @orig_titles=@titles;
!     foreach (@orig_titles) {
          if ( m/^[^:]+:.+$/io ) {
  	    my $t=$_;
***************
*** 600,604 ****
  
      # Place the articles last
!     foreach (@titles) {
          if ( m/^(The|A|Une|Les|Los|Las|L\'|Le|La|El|Das|De|Het|Een)\s+(.*)$/io ) {
  	    my $t=$_;
--- 602,607 ----
  
      # Place the articles last
!     @orig_titles=@titles;
!     foreach (@orig_titles) {
          if ( m/^(The|A|Une|Les|Los|Las|L\'|Le|La|El|Das|De|Het|Een)\s+(.*)$/io ) {
  	    my $t=$_;
***************
*** 609,613 ****
  
      # convert all the special language characters
!     foreach (@titles) {
  	if ( m/[ÀÁÂÃÄÅàáâãäåÈÉÊËèéêëÌÍÎÏìíîïÒÓÔÕÖØòóôõöøÙÚÛÜùúûüÆæÇçÑñßÝýÿ]/io ) {
  	    my $t=$_;
--- 612,617 ----
  
      # convert all the special language characters
!     @orig_titles=@titles;
!     foreach (@orig_titles) {
  	if ( m/[ÀÁÂÃÄÅàáâãäåÈÉÊËèéêëÌÍÎÏìíîïÒÓÔÕÖØòóôõöøÙÚÛÜùúûüÆæÇçÑñßÝýÿ]/io ) {
  	    my $t=$_;
***************
*** 628,639 ****
  
      # strip some punctuation
!     foreach (@titles) {
!         if ( m/[\.]/io ) {
! 	    my $t=$_;
!             $t=~s/\.//gio;
!                 push(@titles, $t);
!         }
      }
- 
      return(\@titles);
  }
--- 632,638 ----
  
      # strip some punctuation
!     for (my $i=0; $i<scalar(@titles) ; $i++) {
! 	$titles[$i]=~s/\.//gio;
      }
      return(\@titles);
  }
***************
*** 2597,2600 ****
--- 2596,2605 ----
      elsif ( $stage == 7 ) {
  	$self->status("parsing Keywords list for stage $stage..");
+ 	
+ 	if ( !defined($self->{imdbListFiles}->{keywords}) ) {
+ 	    $self->status("no keywords file downloaded, see --with-keywords details in documentation");
+ 	    return(0);
+ 	}
+ 	
  	my $countEstimate=410000;
  	my $num=$self->readKeywords($countEstimate, "$self->{imdbListFiles}->{keywords}");
***************
*** 2648,2651 ****
--- 2653,2662 ----
      elsif ( $stage == 8 ) {
  	$self->status("parsing Plot list for stage $stage..");
+ 	
+ 	if ( !defined($self->{imdbListFiles}->{plot}) ) {
+ 	    $self->status("no plot file downloaded, see --with-plot details in documentation");
+ 	    return(0);
+ 	}
+ 	
  	my $countEstimate=222222;
  	my $num=$self->readPlots($countEstimate, "$self->{imdbListFiles}->{plot}");
***************
*** 2963,2966 ****
--- 2974,2978 ----
  	    close(IN);
  	}
+ 
  	if ( 1 ) {
  	    # fill in placeholder if no genres were found
***************
*** 3020,3023 ****
--- 3032,3036 ----
  	    close(IN);
  	}
+ 
  	if ( 1 ) {
  	    # fill in default for movies we didn't have any keywords for

------------------------------------------------------------------------------
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

_______________________________________________
xmltv-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xmltv-commit