xmltv/grab/uk_atlas CHANGELOG, 1.3, 1.4 tv_grab_uk_atlas, 1.7, 1.8

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

Modified Files:
	CHANGELOG tv_grab_uk_atlas 
Log Message:
Improve error message when API Key missing

Index: tv_grab_uk_atlas
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/tv_grab_uk_atlas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tv_grab_uk_atlas	26 Nov 2013 14:20:17 -0000	1.7
--- tv_grab_uk_atlas	4 Dec 2013 10:55:16 -0000	1.8
***************
*** 274,280 ****
  			my $apiKey = '';
  			if ( $conf->{'api-key'}->[0] ) {
! 				$apiKey = '&apiKey='.readpipe("cat ".$conf->{'api-key'}->[0]);
  				chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! 			} 
  			my $publisher = $conf->{'publisher'}->[0] || 'pressassociation.com';	# (undocumented option needed for xmltv automatic testing)
  			my $annotations = 'extended_description,broadcasts,series_summary,brand_summary,people,channel';
--- 274,286 ----
  			my $apiKey = '';
  			if ( $conf->{'api-key'}->[0] ) {
! 				$apiKey = readpipe("cat ".$conf->{'api-key'}->[0]);
  				chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! 				if ($apiKey eq '' || $apiKey eq 'PUT YOUR API KEY HERE') {
! 					print STDERR 'You must obtain an API key free from Atlas Metabroadcast before you can use this grabber'."\n";
! 					print STDERR 'Instructions are available here: http://metabroadcast.com/blog/getting-full-uk-listings-data-from-atlas-it-s-easy'."\n";
! 					exit(1);
! 				}
! 				$apiKey = '&apiKey='.$apiKey;
! 			}
  			my $publisher = $conf->{'publisher'}->[0] || 'pressassociation.com';	# (undocumented option needed for xmltv automatic testing)
  			my $annotations = 'extended_description,broadcasts,series_summary,brand_summary,people,channel';

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/CHANGELOG,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGELOG	20 Oct 2013 17:10:26 -0000	1.3
--- CHANGELOG	4 Dec 2013 10:55:16 -0000	1.4
***************
*** 1,3 ****
! 
  1.1    17-Oct-2013  Rev no. reset to 1.1
  # pre-SourceForge --v
--- 1,10 ----
! 1.8    4-Dec-2013   Improve error message when API Key missing
! 1.7    26-Nov-2013  Improve --help handling
! 1.6    23-Oct-2013  Make "prevent overlaps" the default when fetching programmes
! 1.5    20-Oct-2013  Fix DST issue with programmes fetched from source.
!                     Fix ValidateGrabber reported failure due to programme overlap
! 1.4    19-Oct-2013  Fix error in 'platform' selection
! 1.3    19-Oct-2013  Fix wrong directory when using $ENV{XMLTV_SUPPLEMENT}
! 1.2    18-Oct-2013  Tidy up some code
  1.1    17-Oct-2013  Rev no. reset to 1.1
  # pre-SourceForge --v


------------------------------------------------------------------------------
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk