xmltv/grab/uk_guardian tv_grab_uk_guardian,1.3,1.4

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

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

Index: tv_grab_uk_guardian
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_guardian/tv_grab_uk_guardian,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tv_grab_uk_guardian	19 Oct 2013 09:06:56 -0000	1.3
--- tv_grab_uk_guardian	20 Oct 2013 17:13:35 -0000	1.4
***************
*** 422,426 ****
  		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) {
--- 422,426 ----
  		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) {
***************
*** 556,561 ****
  }
  
! sub get_default_confdir {
!     return get_default_dir() . "/.xmltv";
  }
  
--- 556,562 ----
  }
  
! 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