Bug#629465: Patch for reference

[Dominic Hargreaves]

I was curious, so I went looking for the patch. I eventually found
it here:

http://xmltv.cvs.sourceforge.net/viewvc/xmltv/xmltv/grab/is/tv_grab_is?r1=1.25&r2=1.26&view=patch

(also attached).

Thanks for your investigation so far!

Cheers,
Dominic.

-- 
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)

--- tv_grab_is	2010/11/15 17:13:40	1.25
+++ tv_grab_is	2011/06/22 05:56:34	1.26
@@ -77,7 +77,7 @@
 
 =cut
 use strict;
-use XMLTV::Version '$Id: tv_grab_is,v 1.25 2010/11/15 17:13:40 eggertthor Exp $ ';
+use XMLTV::Version '$Id: tv_grab_is,v 1.26 2011/06/22 05:56:34 rmeden Exp $ ';
 use XMLTV::Capabilities qw/baseline manualconfig cache/;
 use XMLTV::Description 'Iceland';
 use Getopt::Long;
@@ -86,7 +86,6 @@
 use IO::File;
 use URI;
 use utf8; # source code is encoded in utf8
-use Switch;
 
 use Date::Manip;
 use XML::LibXSLT;
@@ -313,19 +312,12 @@
     
     my $timeoffset = ispluschannel($ch_did) ? 1 : 0;
     
-    switch(basechid($ch_did)) {
-        case "RUV"
-            { 
-                push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_ruv_is ];
-            }
-        case "S1"
-            {
-                push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_skjarinn_is ];
-            }
-        case (%stod2AndFriends)
-            {
-                push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_stod2_and_friends ];
-            }
+    if (basechid ($ch_did) eq 'RUV') {
+        push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_ruv_is ];
+    } elsif (basechid ($ch_did) eq 'S1') {
+        push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_skjarinn_is ];
+    } elsif (defined ($stod2AndFriends{basechid ($ch_did)} ) ) {
+        push @to_get, [ $startday, $opt_days, $ch_did, $ch_xid, $timeoffset, \&process_stod2_and_friends ];
     }
 }