xmltv/grab/uk_atlas CHANGELOG, 1.6, 1.7 tv_grab_uk_atlas, 1.10, 1.11

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

Modified Files:
	CHANGELOG tv_grab_uk_atlas 
Log Message:
(minor) Fix to stop nightly test failing

Index: tv_grab_uk_atlas
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/tv_grab_uk_atlas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tv_grab_uk_atlas	5 Dec 2013 15:21:29 -0000	1.10
--- tv_grab_uk_atlas	5 Dec 2013 16:42:09 -0000	1.11
***************
*** 273,287 ****
  			
  			my $baseurl = $ROOT_URL.'schedule.json';
  			my $apiKey = $conf->{'api-key'}->[0];
  			chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! 			if ($apiKey eq '') {
  				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);
  			}
! 			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';
  
! 			my $url = $baseurl.'?'."channel_id=$channel_id&from=$from&to=$to&annotations=$annotations&publisher=$publisher&apiKey=$apiKey";
  			print $url ."\n" 	if ($opt->{debug});
  			#print STDERR "$url \n";
--- 273,288 ----
  			
  			my $baseurl = $ROOT_URL.'schedule.json';
+ 			my $publisher = $conf->{'publisher'}->[0] || 'pressassociation.com';	# (undocumented option needed for xmltv automatic testing)
  			my $apiKey = $conf->{'api-key'}->[0];
  			chomp($apiKey); chop($apiKey) if ($apiKey =~ m/\r$/);
! 			if ($apiKey eq '' && $publisher ne 'bbc.co.uk') {
  				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  if ($apiKey ne '');
  			my $annotations = 'extended_description,broadcasts,series_summary,brand_summary,people,channel';
  
! 			my $url = $baseurl.'?'."channel_id=$channel_id&from=$from&to=$to&annotations=$annotations&publisher=$publisher$apiKey";
  			print $url ."\n" 	if ($opt->{debug});
  			#print STDERR "$url \n";
***************
*** 1164,1168 ****
  sub config_check {
  		if (not defined( $conf->{cachedir} )) {
! 				print STDERR "No cachedir defined in configfile " . 
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";
--- 1165,1169 ----
  sub config_check {
  		if (not defined( $conf->{cachedir} )) {
! 				print STDERR "No cachedir defined in config file " . 
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";
***************
*** 1171,1175 ****
  
  		if (not defined( $conf->{'channel'} )) {
! 				print STDERR "No channels selected in configfile " .
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";
--- 1172,1176 ----
  
  		if (not defined( $conf->{'channel'} )) {
! 				print STDERR "No channels selected in config file " .
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";
***************
*** 1178,1182 ****
  
  		if (not defined( $conf->{'api-key'} )) {
! 				print STDERR "No api-key filename in configfile " .
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";
--- 1179,1183 ----
  
  		if (not defined( $conf->{'api-key'} )) {
! 				print STDERR "No api-key defined in config file " .
  										 $opt->{'config-file'} . "\n" .
  										 "Please run the grabber with --configure.\n";

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_atlas/CHANGELOG,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CHANGELOG	5 Dec 2013 15:21:29 -0000	1.6
--- CHANGELOG	5 Dec 2013 16:42:09 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ 1.11   5-Dec-2013   Minor mod to config validation
  1.10   5-Dec-2013   Changed handling of map files
  1.9    5-Dec-2013   Move apikey from separate file to --configure stage


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