xmltv/grab/uk_tvguide tv_grab_uk_tvguide,1.2,1.3

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

Modified Files:
	tv_grab_uk_tvguide 
Log Message:
Fix for $ENV{XMLTV_SUPPLEMENT} used by nightly validator

Index: tv_grab_uk_tvguide
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_tvguide/tv_grab_uk_tvguide,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tv_grab_uk_tvguide	18 Oct 2013 08:45:51 -0000	1.2
--- tv_grab_uk_tvguide	20 Oct 2013 17:14:44 -0000	1.3
***************
*** 692,696 ****
  		my $mapcategories = \%mapcategoryhash;
  		#		
! 		my $fn = get_default_confdir() . "/supplement/$GRABBER_NAME/$GRABBER_NAME.map.conf";
  		my $fhok = open my $fh, '<', $fn or warning("Cannot open conf file $fn");
  		if ($fhok) {
--- 692,696 ----
  		my $mapcategories = \%mapcategoryhash;
  		#		
! 		my $fn = get_supplement_dir() . '/'. $GRABBER_NAME . '.map.conf';
  		my $fhok = open my $fh, '<', $fn or warning("Cannot open conf file $fn");
  		if ($fhok) {
***************
*** 825,830 ****
  }
  
! sub get_default_confdir {
!     return get_default_dir() . "/.xmltv";
  }
  
--- 825,831 ----
  }
  
! sub get_supplement_dir {
! 		return $ENV{XMLTV_SUPPLEMENT} . "/" . $GRABBER_NAME  if defined( $ENV{XMLTV_SUPPLEMENT} );
!     return get_default_dir() . "/.xmltv/supplement/" . $GRABBER_NAME;
  }
  


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk