Changeset 679

Timestamp:

05/23/07 18:26:09 (6 years ago)

Author:

lincoln

Message:

refine the way we process ABC/ABC2 station close: with some ABC programming, ABC no longer indicate station close on some days, they're broadcasting 24 hours.

Files:

• grabbers/abc_website (modified) (5 diffs)
• status (modified) (1 diff)

grabbers/abc_website

@@ -22 +22 @@
 
 my $progname = "abc_website";
-my $version = "3.01";
+my $version = "3.02";
 
 use LWP::UserAgent;
@@ -292 +292 @@
         my $unprocessed_programmes = 0;
         my $stop_fetching = 0;
-        my @unprocessed_progname, my @unprocessed_starttime, my @unprocessed_url;
+        my @unprocessed_progname, my @unprocessed_starttime, my @unprocessed_url, my @unprocessed_day;
 
         my $to_skip = $opt_offset;
@@ -391 +391 @@
                                                                         $unprocessed_progname[$unprocessed_programmes] = $programme;
                                                                         $unprocessed_starttime[$unprocessed_programmes] = $found_time;
+                                                                        $unprocessed_day[$unprocessed_programmes] = $daynum;
                                                                         $unprocessed_url[$unprocessed_programmes] = "http://www.abc.net.au".$progurl;
                                                                         $unprocessed_programmes++;
@@ -414 +415 @@
                                 $unprocessed_progname[$unprocessed_programmes] = "Station Close";
                                 $unprocessed_starttime[$unprocessed_programmes] = $station_close_data->{$xmlid}->[$daynum];
+                                $unprocessed_day[$unprocessed_programmes] = $daynum;
                                 $unprocessed_url[$unprocessed_programmes] = "";
                                 $unprocessed_programmes++;
-                        } else {
-                                # throw away last programme from each day - we can't use it as
-                                # we don't have a 'stop' time for it
-
-                                printf "throwing away '%s' (%s) because we won't have a valid stop time\n",
-                                        $unprocessed_progname[$unprocessed_programmes-1],
-                                        POSIX::strftime("%Y%m%d%H%M", localtime($unprocessed_starttime[$unprocessed_programmes-1]))
-                                        if $debug;
-                                $unprocessed_progname[$unprocessed_programmes-1] = "";
                         }
                 } else {
@@ -440 +433 @@
 
         for (my $i = 0; $i < ($unprocessed_programmes-1); $i++) {
-                next if ($unprocessed_progname[$i] eq "");
+                # if we've found a programme which is between days, evaluate whether we can
+                # use it or need to drop it (because we won't necessarily have a 'stop' time
+                if (($unprocessed_day[$i] != $unprocessed_day[($i+1)]) &&
+                    ($unprocessed_progname[$i] ne "Station Close")) {
+                        # we'd normally throw away last programme from each day - we can't use it
+                        # as we don't have a 'stop' time for it.
+                        # with some ABC programming, ABC no longer indicate any station close
+                        # on some days - they're broadcasting 24 hours.
+                        # only throw away the last programme if:
+                        #   1. it is seen to run longer than 3.5 hours
+                        #   2. it is a different title
+                        if ((($unprocessed_starttime[$i+1] - $unprocessed_starttime[$i]) > (3.5*3600)) &&
+                            ($unprocessed_progname[$i] ne $unprocessed_progname[$i+1])) {
+                                printf "throwing away '%s' (%s) because we won't have a valid stop time (%s) and title is different (%s)\n",
+                                        $unprocessed_progname[$i],
+                                        POSIX::strftime("%Y%m%d%H%M", localtime($unprocessed_starttime[$i])),
+                                        POSIX::strftime("%Y%m%d%H%M", localtime($unprocessed_starttime[$i+1])),
+                                        $unprocessed_progname[$i+1]
+                                        if $debug;
+                                next;
+                        }
+                }
 
                 # if we are micro-gap fetching, only include programmes which match our micro gaps

status

@@ -2 +2 @@
 grabber         yahoo7widget        1.83-r1
 grabber         rex                 3.4.10
-grabber         abc_website         3.01-r1
+grabber         abc_website         3.02
 grabber         sbsnews_website     0.14
 grabber         oztivo              0.29