Changeset 623

Timestamp:

03/21/07 14:30:51 (6 years ago)

Author:

max

Message:

Bugfix exact switchover time for DST: need to do it in GMT

Files:

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

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '0.21';
+my $version = '0.22';
 
 # Requires configuration!
@@ -401 +401 @@
     {
         # Is Sydney in DST?
-        my $sydney_dst = compare_sydney_dst($local_dst);
+        my $sydney_dst = compare_sydney_dst();
         POSIX::tzset();
 
@@ -407 +407 @@
         {
             my $offset = ' +0100';
-            print "DST in Sydney but not here: adding 1 hour to ABC2 times" .
+            print "DST in Sydney but not here: adding 1hr to ABC2 times" .
                   ($sydney_dst != 1 ? ($sydney_dst > 1 ? 
-                          " from $sydney_dst" : 
-                          " until " . ($sydney_dst*-1)) : '') .
+                          " from $sydney_dst GMT" : 
+                          " until " . ($sydney_dst*-1) . ' GMT') : '') .
                   ".\n";
             $data =~ s/(?!=")(\d+)(?=".* channel="ABC2")/$1.add_offset($1,$sydney_dst)/ge;
@@ -436 +436 @@
 # Returns:
 # 0         : Sydney is not in DST in the next 7 days
-# <n>       : Sydney is in DST from <n>, where n is (eg) 200703210300
-# <-n>      : Sydney is in DST until <n>, where n is (eg) -200703210300
+# 1         : Sydney is in DST for the next 7 days
+# <n>       : Sydney is in DST from <n> GMT, where n is (eg) 20070321030000
+# <-n>      : Sydney is in DST until <n> GMT, where n is (eg) -20070321030000
 sub compare_sydney_dst
 {
-    my $local_dst = shift;
-
     local %ENV;
     $ENV{TZ} = 'Australia/Sydney';
@@ -447 +446 @@
     my $sydney_dst = (localtime)[8];
 
-    return $sydney_dst if ($sydney_dst == $local_dst);
-
+    # Normalize $start to 3AM Sydney time, or 2AM if it's in DST
     my $start = time - (time % (60*60*24)) - (($sydney_dst ? 11 : 10) * 60*60) + (3*60*60);
+
+    # Check Sydney's DST status each day for 7 days
     for (my $day = 0; $day < 7; $day++)
     {
         my $t = $start + ($day * 24*60*60);
         my $dst_thisday = (localtime($t))[8];
+
+        # Any changeover?
         if ($dst_thisday != $sydney_dst)
         {
+            # Convert $t to GMT
+            $t -= (($sydney_dst ? 11 : 10) * 60*60);
             my $changeoverday = POSIX::strftime("%Y%m%d%H%M%S", localtime($t));
             $changeoverday *= -1 if ($sydney_dst);

status

@@ -5 +5 @@
 grabber         abc2_website        2.11
 grabber         sbsnews_website     0.11
-grabber         oztivo              0.21
+grabber         oztivo              0.22
 grabber         jrobbo              0.08
 grabber         ninemsn             0.14