Changeset 542

Timestamp:

02/21/07 19:52:53 (6 years ago)

Author:

lincoln

Message:

ensure paytv channels dont contain special characters

Files:

• applications/shepherd (modified) (3 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.58';
+my $version = '0.4.59';
 
 # tv_grab_au
@@ -1462 +1462 @@
         foreach (@paytv_channellist) {
             my $default = lc($_);       # make a default id by lower-casing
-            $default =~ s/[ \t()\[\]\+\.]//g; # remove special chars
-            $default =~ s/&/and/g;  # & to and
-            $default =~ s|[/,].*||;     # and deleting after / or ,
             $default = $oldopt_channels->{$_} || $default . ".paytv.au";
                                         # and tack on ".paytv.au".  But use
@@ -1642 +1639 @@
     while ($page =~ /<option value="\/channel\/.*?>(.*?)<\/option>/sg)
     {
-        push @channellist,$1;
+        my $ch = $1;
+        $ch =~ s/[ \t()\[\]\+\.\-]//g;  # remove special chars
+        $ch =~ s/&amp;/and/g;           # &amp; to and
+        $ch =~ s|[/,].*||;              # and deleting after / or ,
+
+        push @channellist,$ch;
     }
 

status

@@ -1 @@
-application     shepherd            0.4.58
+application     shepherd            0.4.59
 grabber         yahoo7widget        1.80
 grabber         rex                 3.4.2