xmltv/grab/uk_rt tv_grab_uk_rt,1.19,1.20

Update of /cvsroot/xmltv/xmltv/grab/uk_rt
In directory vz-cvs-3.sog:/tmp/cvs-serv5406/grab/uk_rt

Modified Files:
	tv_grab_uk_rt 
Log Message:
Tidy up some referencing

Index: tv_grab_uk_rt
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/tv_grab_uk_rt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tv_grab_uk_rt	9 Jun 2012 03:36:49 -0000	1.19
--- tv_grab_uk_rt	9 Jun 2012 04:07:22 -0000	1.20
***************
*** 33,38 ****
  # - wrap date/file tests in evals if there is a risk of failure
  #
- # - tidy up references (arrows/no dereferencing)
- #
  # - remove fixups from prog_titles_to_process that are now handled automatically
  #   e.g. duplicated title and/or episode in episode field
--- 33,36 ----
***************
*** 171,175 ****
  # Update encoding if seen in new-style config file
  if (defined( $conf->{encoding} )) {
!     $xml_encoding = $conf->{encoding}->[0];
  }
  
--- 169,173 ----
  # Update encoding if seen in new-style config file
  if (defined( $conf->{encoding} )) {
!     $xml_encoding = $conf->{encoding}[0];
  }
  
***************
*** 177,181 ****
  my $title_processing;
  if (defined( $conf->{'title-processing'} )) {
!     $title_processing = $conf->{'title-processing'}->[0];
  }
  else {
--- 175,179 ----
  my $title_processing;
  if (defined( $conf->{'title-processing'} )) {
!     $title_processing = $conf->{'title-processing'}[0];
  }
  else {
***************
*** 186,190 ****
  my $utf8_fixups_status;
  if (defined( $conf->{'utf8-fixups'} )) {
!     $utf8_fixups_status = $conf->{'utf8-fixups'}->[0];
  }
  else {
--- 184,188 ----
  my $utf8_fixups_status;
  if (defined( $conf->{'utf8-fixups'} )) {
!     $utf8_fixups_status = $conf->{'utf8-fixups'}[0];
  }
  else {
***************
*** 193,197 ****
  
  # Initialise the cache-directory
! init_cachedir( $conf->{cachedir}->[0] );
  
  # Set cache options
--- 191,195 ----
  
  # Initialise the cache-directory
! init_cachedir( $conf->{cachedir}[0] );
  
  # Set cache options
***************
*** 201,205 ****
  #
  HTTP::Cache::Transparent::init( {
!     BasePath       => $conf->{cachedir}->[0],
      MaxAge         => 15*24,
      NoUpdate       => 60*60,
--- 199,203 ----
  #
  HTTP::Cache::Transparent::init( {
!     BasePath       => $conf->{cachedir}[0],
      MaxAge         => 15*24,
      NoUpdate       => 60*60,
***************
*** 366,370 ****
      # Use default cachedir as there was no support for choosing an alternative
      # cache directory before ParseOptions support was added to the grabber.
!     $conf->{cachedir}->[0] = $default_cachedir;
      $conf->{channel} = [];
  
--- 364,368 ----
      # Use default cachedir as there was no support for choosing an alternative
      # cache directory before ParseOptions support was added to the grabber.
!     $conf->{cachedir}[0] = $default_cachedir;
      $conf->{channel} = [];
  
***************
*** 470,474 ****
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}->[0];
      }
  
--- 468,472 ----
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}[0];
      }
  
***************
*** 844,848 ****
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}->[0];
      }
  
--- 842,846 ----
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}[0];
      }
  
***************
*** 905,909 ****
  
      t("Started writing <channel> elements...");
!     foreach my $chan_href (@{ $wanted_chs }) {
          my %h = %$chan_href;
          delete $h{'rt_id'};
--- 903,907 ----
  
      t("Started writing <channel> elements...");
!     foreach my $chan_href (@{$wanted_chs}) {
          my %h = %$chan_href;
          delete $h{'rt_id'};
***************
*** 919,923 ****
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}->[0];
      }
  
--- 917,921 ----
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}[0];
      }
  
***************
*** 963,967 ****
      # Process all of the channels we want listings for
      WANTED_CH:
!     foreach my $chan_href (@{ $wanted_chs }) {
          my $xmltv_id = $chan_href->{'id'};
          my $rt_id    = $chan_href->{'rt_id'};
--- 961,965 ----
      # Process all of the channels we want listings for
      WANTED_CH:
!     foreach my $chan_href (@{$wanted_chs}) {
          my $xmltv_id = $chan_href->{'id'};
          my $rt_id    = $chan_href->{'rt_id'};
***************
*** 3901,3905 ****
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}->[0];
      }
  
--- 3899,3903 ----
      # Update encoding if seen in new-style config file
      if (defined( $conf->{encoding} )) {
!         $xml_encoding = $conf->{encoding}[0];
      }
  
***************
*** 4107,4111 ****
      elsif ($stage eq 'select-packages') {
  
!         my $lineup = $conf->{lineup}->[0];
          my $lineup_doc = parse_lineup_xml_doc("$lineup.xml");
  
--- 4105,4109 ----
      elsif ($stage eq 'select-packages') {
  
!         my $lineup = $conf->{lineup}[0];
          my $lineup_doc = parse_lineup_xml_doc("$lineup.xml");
  
***************
*** 4250,4254 ****
      # Update encoding if seen in new-style config file
      if (exists $conf->{encoding}) {
!         $xml_encoding = $conf->{encoding}->[0];
      }
  
--- 4248,4252 ----
      # Update encoding if seen in new-style config file
      if (exists $conf->{encoding}) {
!         $xml_encoding = $conf->{encoding}[0];
      }
  
***************
*** 4257,4261 ****
      # only filter available channels if we see a lineup entry
      if (exists $conf->{lineup})  {
!         my $lineup = $conf->{lineup}->[0];
          my $doc = parse_lineup_xml_doc("$lineup.xml");
          $channels = get_supported_lineup_channels($conf, $opt, $doc, $channels);
--- 4255,4259 ----
      # only filter available channels if we see a lineup entry
      if (exists $conf->{lineup})  {
!         my $lineup = $conf->{lineup}[0];
          my $doc = parse_lineup_xml_doc("$lineup.xml");
          $channels = get_supported_lineup_channels($conf, $opt, $doc, $channels);
***************
*** 4335,4339 ****
      my $lineup;
      if (exists $conf->{lineup}) {
!         $lineup = $conf->{lineup}->[0];
          my $doc = parse_lineup_xml_doc("$lineup.xml");
          $available_channels = get_supported_lineup_channels($conf, $opt, $doc, $available_channels);
--- 4333,4337 ----
      my $lineup;
      if (exists $conf->{lineup}) {
!         $lineup = $conf->{lineup}[0];
          my $doc = parse_lineup_xml_doc("$lineup.xml");
          $available_channels = get_supported_lineup_channels($conf, $opt, $doc, $available_channels);
***************
*** 4622,4626 ****
  
      CONFIG_CHANNEL:
!     foreach my $chan_id (@{ $conf->{'channel'} }) {
          t("  Read channel '$chan_id'");
          if (! exists $xmltv_channels_href->{$chan_id}) {
--- 4620,4624 ----
  
      CONFIG_CHANNEL:
!     foreach my $chan_id (@{$conf->{'channel'}}) {
          t("  Read channel '$chan_id'");
          if (! exists $xmltv_channels_href->{$chan_id}) {


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/