Changeset 510

Timestamp:

02/11/07 18:26:10 (6 years ago)

Author:

max

Message:

Channel 31 for oztivo grabber (#32)

Files:

• grabbers/oztivo (modified) (4 diffs)
• status (modified) (1 diff)

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '0.14';
+my $version = '0.15';
 
 # Requires configuration!
@@ -28 +28 @@
 #         so the rest of shepherd knows this.
 # 0.14  : patch from Paul to address TEN/10 channels
+# 0.15  : should grab Channel/Access 31s properly now
 
 use strict;
@@ -108 +109 @@
 
 my $shortchannels;
-while (my ($name, $chanid) = each %$channels) {
+while (my ($name, $chanid) = each %$channels) 
+{
+  # Ignore differences between rural stations like
+  # Seven (Rockhampton) and Seven (Cairns) -- this is not a great
+  # solution and should be fixed.
   $name =~ s/ *\(.*?\)//g;
   $shortchannels->{$name} = $chanid;
-  if ($name =~ /TEN/i) {
-    $shortchannels->{10} = $chanid;
-  }
 }
 
@@ -265 +267 @@
 
     $station = "SBS NEWS" if ($station eq "SBS-NEWS");
-
-    foreach (@clist)
+    $station =~ s/10/TEN/g;
+
+    my $num = $1 if ($station =~ /(\d{2,})/);
+    foreach my $ch (@clist)
     {
-        return $shortchannels->{$_} if ($station =~ /$_/i);
+        if ($station =~ /$ch/i
+                or
+            ($num and $ch =~ /$num/))
+        {
+            return $shortchannels->{$ch};
+        }
     }
 

status

@@ -5 +5 @@
 grabber         abc2_website        2.07
 grabber         sbsnews_website     0.06
-grabber         oztivo              0.14
+grabber         oztivo              0.15
 grabber         jrobbo              0.06
 grabber         ninemsn             0.09