xmltv/grab/eu_epgdata tv_grab_eu_epgdata,1.43,1.44

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

Modified Files:
	tv_grab_eu_epgdata 
Log Message:
Fix passing display-names. Fixes missing <channel> tags in output.

Index: tv_grab_eu_epgdata
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/eu_epgdata/tv_grab_eu_epgdata,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** tv_grab_eu_epgdata	9 Oct 2014 19:45:28 -0000	1.43
--- tv_grab_eu_epgdata	9 Oct 2014 20:24:06 -0000	1.44
***************
*** 576,581 ****
  # which is in turn called by processxml()
  sub printchannels {
!     my ($twig, $sendung) = @_;
!     my $internalchanid   = $sendung->first_child('ch4')->text;
      our $chanid;
      if (defined $main::chanid{$internalchanid}) {
--- 576,581 ----
  # which is in turn called by processxml()
  sub printchannels {
!     my ($twig, $channel) = @_;
!     my $internalchanid   = $channel->first_child('ch4')->text;
      our $chanid;
      if (defined $main::chanid{$internalchanid}) {
***************
*** 587,604 ****
      }
      my @names;
!     if ($sendung->first_child('ch11')->text) {
!         push(@names, [ $sendung->first_child('ch11')->text ]);
      }
!     if ($sendung->first_child('ch0')->text) {
!         push(@names, [ $sendung->first_child('ch0')->text ]);
      }
!     if ($sendung->first_child('ch1')->text) {
!         push(@names, [ $sendung->first_child('ch1')->text ]);
      }
!     foreach my $channel (@{$conf->{channel}}) {
!         if ($channel eq $chanid) {
              my %ch = (
                  'id' => $chanid,
!                 'display-name' => @names
              );
              $writer->write_channel(\%ch);
--- 587,604 ----
      }
      my @names;
!     if ($channel->first_child('ch11')->text) {
!         push(@names, [ $channel->first_child('ch11')->text ]);
      }
!     if ($channel->first_child('ch0')->text) {
!         push(@names, [ $channel->first_child('ch0')->text ]);
      }
!     if ($channel->first_child('ch1')->text) {
!         push(@names, [ $channel->first_child('ch1')->text ]);
      }
!     foreach my $conf_channel (@{$conf->{channel}}) {
!         if ($conf_channel eq $chanid) {
              my %ch = (
                  'id' => $chanid,
!                 'display-name' => \@names
              );
              $writer->write_channel(\%ch);


------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk