Changeset 486

Timestamp:

02/03/07 18:05:40 (6 years ago)

Author:

lincoln

Message:

fix microgap support in abc2_website - was expecting XMLTV date/time format not epoch format

Files:

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

grabbers/abc2_website

@@ -22 +22 @@
 my $progname = "abc2_website";
 my $chan_id = "ABC2";
-my $version = "2.05";
+my $version = "2.06";
 
 use LWP::UserAgent;
@@ -284 +284 @@
 
                 if ($opt_gaps_file ne "") {             # micro-gap mode!
-                        my $today = POSIX::strftime("%Y%m%d", localtime($currtime));
                         my $found_gap_match = 0;
 
@@ -290 +289 @@
                                 foreach my $g (@{($gaps->{$chan_id})}) {
                                         my ($s, $e) = split(/-/,$g);
-                                        if ((substr($s,0,8) >= $today) && (substr($e,0,8) <= $today)) {
+                                        if (($s >= $currtime) && ($e <= ($currtime+86400))) {
                                                 $found_gap_match++;
-                                                push(@gap_s,parse_xmltv_date($s));
-                                                push(@gap_e,parse_xmltv_date($e));
+                                                push(@gap_s,$s);
+                                                push(@gap_e,$e);
+                                                printf "including day %d channel '%s' gap start %d, gap end %d\n",
+                                                        $daynum, $chan_id, $s, $e if $debug;
                                         }
                                 }
@@ -362 +363 @@
                                                                         printf "day %d time '%s' (%s) prog: %s url: %s\n",
                                                                                 $daynum,$tree_row->as_text(),POSIX::strftime("%Y%m%d%H%M", localtime($found_time)),
-                                                                                $programme,$progurl if $debug;
+                                                                                $programme,$progurl if ($debug && $debug > 1);
 
                                                                         $unprocessed_progname[$unprocessed_programmes] = $programme;
@@ -419 +420 @@
                                 $found_gap_match++
                                   if ((($gap_s[$g_num] <= $unprocessed_starttime[$i]) &&
-                                       ($gap_e[$g_num] >= $unprocessed_starttime[$i])) ||
-                                      (($gap_s[$g_num] <= $unprocessed_starttime[$i+1]) &&
-                                       ($gap_e[$g_num] >= $unprocessed_starttime[$i+1])));
+                                       ($gap_s[$g_num] <= $unprocessed_starttime[$i+1])) ||
+                                      (($gap_e[$g_num] <= $unprocessed_starttime[$i]) &&
+                                       ($gap_e[$g_num] <= $unprocessed_starttime[$i+1])));
                         }
                         next if (!$found_gap_match);
+
+                        $stats{programme_gaps_used}++;
+                        printf "gap-fetching: including prog '%s', start %d, end %d\n", $unprocessed_progname[$i], 
+                                $unprocessed_starttime[$i], $unprocessed_starttime[$i+1] if $debug;
                 }
 

status

@@ -3 +3 @@
 grabber         rex                 3.4.0
 grabber         abc_website         2.05
-grabber         abc2_website        2.05
+grabber         abc2_website        2.06
 grabber         sbsnews_website     0.04
 grabber         oztivo              0.13-r1