xmltv/grab/combiner tv_grab_combiner,1.3,1.4

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

Modified Files:
	tv_grab_combiner 
Log Message:
Whitespace: remove trailing whitespace

Index: tv_grab_combiner
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/combiner/tv_grab_combiner,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tv_grab_combiner	13 Jun 2012 22:26:02 -0000	1.3
--- tv_grab_combiner	12 Jul 2015 00:46:37 -0000	1.4
***************
*** 13,17 ****
  tv_grab_combiner --configure [--config-file FILE]
  
! tv_grab_combiner [--config-file FILE] 
                   [--days N] [--offset N]
                   [--output FILE] [--quiet]
--- 13,17 ----
  tv_grab_combiner --configure [--config-file FILE]
  
! tv_grab_combiner [--config-file FILE]
                   [--days N] [--offset N]
                   [--output FILE] [--quiet]
***************
*** 55,59 ****
  =head1 ERROR HANDLING
  
! If any of the called grabbers exit with an error, tv_grab_combiner will 
  exit with a status code of 1 to indicate that the data is incomplete. If any
  grabber produces output that is not well-formed xml, the output from that
--- 55,59 ----
  =head1 ERROR HANDLING
  
! If any of the called grabbers exit with an error, tv_grab_combiner will
  exit with a status code of 1 to indicate that the data is incomplete. If any
  grabber produces output that is not well-formed xml, the output from that
***************
*** 63,71 ****
  
  The environment variable HOME can be set to change where configuration
! files are stored. All configuration is stored in $HOME/.xmltv/. 
  
  =head1 AUTHOR
  
! Mattias Holmlund, mattias -at- holmlund -dot- se. 
  
  =head1 BUGS
--- 63,71 ----
  
  The environment variable HOME can be set to change where configuration
! files are stored. All configuration is stored in $HOME/.xmltv/.
  
  =head1 AUTHOR
  
! Mattias Holmlund, mattias -at- holmlund -dot- se.
  
  =head1 BUGS
***************
*** 94,98 ****
             help => 0,
             configure => 0,
!            'config-file' => 
               XMLTV::Config_file::filename(undef, 'tv_grab_combiner', 1 ),
             days => undef,
--- 94,98 ----
             help => 0,
             configure => 0,
!            'config-file' =>
               XMLTV::Config_file::filename(undef, 'tv_grab_combiner', 1 ),
             days => undef,
***************
*** 114,118 ****
    exit 1;
  }
! else { 
    exit 0;
  }
--- 114,118 ----
    exit 1;
  }
! else {
    exit 0;
  }
***************
*** 156,160 ****
      }
    }
!   
    if( defined $result ) {
      if( defined( $opt->{output} ) ) {
--- 156,160 ----
      }
    }
! 
    if( defined $result ) {
      if( defined( $opt->{output} ) ) {
***************
*** 192,196 ****
  
    print "Configuring $grabber\n";
!  
    my( $fh, $filename ) = tempfile();
    system( $grabber, '--configure', '--config-file', $filename );
--- 192,196 ----
  
    print "Configuring $grabber\n";
! 
    my( $fh, $filename ) = tempfile();
    system( $grabber, '--configure', '--config-file', $filename );
***************
*** 219,223 ****
    $config =~ s/&n/\n/g;
    $config =~ s/&a/&/g;
!   
    print $fh $config;
  }
--- 219,223 ----
    $config =~ s/&n/\n/g;
    $config =~ s/&a/&/g;
! 
    print $fh $config;
  }
***************
*** 230,238 ****
    my %grabbers;
  
!   foreach (reverse @result) { 
      chomp;
      chomp;
!     my($g, $t) = split( /\|/, $_ ); 
!     $grabbers{$t}=$g 
        unless $g=~/tv_grab_combiner/;
    }
--- 230,238 ----
    my %grabbers;
  
!   foreach (reverse @result) {
      chomp;
      chomp;
!     my($g, $t) = split( /\|/, $_ );
!     $grabbers{$t}=$g
        unless $g=~/tv_grab_combiner/;
    }
***************
*** 240,244 ****
    open( CONF, "> " . $opt->{'config-file'});
    while( 1 ) {
!     my $t = ask_choice( "Select a grabber:", "Done", 
                          "Done", sort( keys %grabbers) );
      last if $t eq "Done";
--- 240,244 ----
    open( CONF, "> " . $opt->{'config-file'});
    while( 1 ) {
!     my $t = ask_choice( "Select a grabber:", "Done",
                          "Done", sort( keys %grabbers) );
      last if $t eq "Done";
***************
*** 275,283 ****
      $last_prog = $prog;
    }
!   
  }
  
! sub slurp { 
!   local( $/, @ARGV ) = ( wantarray ? $/ : undef, @_ ); 
    return <ARGV>;
  }
--- 275,283 ----
      $last_prog = $prog;
    }
! 
  }
  
! sub slurp {
!   local( $/, @ARGV ) = ( wantarray ? $/ : undef, @_ );
    return <ARGV>;
  }


------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/