Changeset 1215

Timestamp:

11/02/06 07:00:11 (2 years ago)

Author:

dominik

Message:

lots of fixes regarding the time calculation and gmt and dst offsets
fixed not generating final rules while non final rules are active
some typo fixes

Files:

• trunk/src/config/AgaviTimeZoneDataParser.class.php (modified) (11 diffs)

trunk/src/config/AgaviTimeZoneDataParser.class.php

@@ -136 +136 @@
 
     $this->prepareRules($rules);
+    foreach($this->rules as $name => $rule) {
+      echo "rule $name:\n";
+      foreach($rule['rules'] as $r) {
+        echo " rule ($r[time]  ".implode(',', array_keys($r))."): " . gmdate("d.m.Y H:i:s", $r['time']) . "\n";
+      }
+      echo "\n";
+    }
     $zones = $this->generateDatatables($zones);
 
@@ -148 +155 @@
       $activeRules = array();
       $myRules = array();
+
+      $lastDstOff = 0;
 
       $cnt = count($ruleList);
@@ -165 +174 @@
         do {
           $needsBreak = false;
+
+          $hasNonFinalRules = false;
+          // check if we have any active rules which are not final, so we need to process the final ones too
+          foreach($activeRules as $activeRule) {
+            if($activeRule['endYear'] != self::MAX_YEAR_VALUE) {
+              $hasNonFinalRules = true;
+              break;
+            }
+          }
+
           // remove all (still) active rules which don't apply anymore
           foreach($activeRules as $activeRuleIdx => $activeRule) {
@@ -173 +192 @@
               unset($activeRules[$activeRuleIdx]);
             // protect against generating final rules, they are handled in the timezone implementation
-            } elseif($year != $activeRule['startYear'] && $activeRule['endYear'] != self::MAX_YEAR_VALUE) {
+            } elseif($year != $activeRule['startYear'] && $hasNonFinalRules) {
               // if the year is the start year this rule has already been processed for this year
-              $time = $this->getOnDate($year, $activeRule['month'], $activeRule['on'], $myRule['at'], 0, $dstOff);
+              $time = $this->getOnDate($year, $activeRule['month'], $activeRule['on'], $myRule['at'], 0, 0);
               $myRules[] = array('time' => $time, 'rule' => $activeRule);
             }
@@ -181 +200 @@
 
           if($year == $myRule['startYear']) {
-            $time = $this->getOnDate($year, $myRule['month'], $myRule['on'], $myRule['at'], 0, $dstOff);
-            if($myRule['endYear'] != self::MAX_YEAR_VALUE) {
+            $time = $this->getOnDate($year, $myRule['month'], $myRule['on'], $myRule['at'], 0, 0);
+
+            if($myRule['endYear'] != self::MAX_YEAR_VALUE || $hasNonFinalRules) {
               $myRules[] = array('time' => $time, 'rule' => $myRule);
             }
@@ -217 +237 @@
       throw new IllegalArgumentException('No rule with the name ' . $name . ' exists');
     }
+
+    $lastDstOff = 0;
 
     $rules = array();
@@ -231 +253 @@
         $untilDate = $this->dateStrToArray($until);
         $untilTime = $this->getOnDate($untilDate['year'], $untilDate['month'], array('type' => 'date', 'date' => $untilDate['day'], 'day' => null), array('secondsInDay' => $untilDate['time']['seconds'], 'type' => $untilDate['time']['type']), $gmtOff, $dstOff);
-      }
-
-      switch($rule['rule']['on']['type']) {
+        var_dump("$until: $untilTime " . gmdate('d.m.Y H:i:s', $untilTime));
+      }
+
+      switch($rule['rule']['at']['type']) {
         case 'wallclock':
-          $time -= $stdOff;
-          // the missing break is intentional !
+          var_dump('wallclock on ' . $name . ' (' . gmdate('d.m.Y H:i:s', $time) . '): ' . $lastDstOff . ' ' . $gmtOff);
+          $time -= $lastDstOff;
+          $time -= $gmtOff;
+          break;
+
         case 'standard':
+          var_dump('standard on ' . $name . ' (' . gmdate('d.m.Y H:i:s', $time) . '):  ' . $gmtOff);
           $time -= $gmtOff;
-      }
+          break;
+      }
+
+      $lastDstOff = $dstOff;
 
       if($from !== null && $time < $from) {
@@ -246 +276 @@
         continue;
       } elseif($firstHit) {
-        $insertRuleName = sprintf(is_array($format) ? $format[0] : $format, $lastSkippedRule !== null ? $lastSkippedRule['rule']['variablePart'] : '');
-
-        $rules[] = array(
-          'time' => $from,
-          'rawOffset' => $gmtOff,
-          'dstOffset' => 0,
-          'name' => $insertRuleName,
-        );
+        if($from != $time) {
+          $insertRuleName = sprintf(is_array($format) ? $format[0] : $format, $lastSkippedRule !== null ? $lastSkippedRule['rule']['variablePart'] : '');
+
+          $rules[] = array(
+            'time' => $from,
+            'rawOffset' => $gmtOff,
+            'dstOffset' => 0,
+            'name' => $insertRuleName,
+          );
+        } else {
+          var_dump("hit $from on $time " . gmdate('d.m.Y H:i:s', $time));
+        }
         $firstHit = false;
       }
@@ -323 +357 @@
 
           if($lastRuleEndTime !== null) {
+            var_dump("adding last role $format : $lastRuleEndTime " . gmdate("d.m.Y H:i:s", $lastRuleEndTime));
             $myRules[] = array('time' => $lastRuleEndTime, 'rawOffset' => $gmtOff, 'dstOffset' => $dstOff, 'name' => $format);
           } else {
@@ -680 +715 @@
     $at = $ruleColumns[6];
     $lastAtChar = substr($at, -1);
-    $atType = 'wallClock';
+    $atType = 'wallclock';
     if($lastAtChar == 'w') {
       $at = substr($at, 0, -1);
@@ -872 +907 @@
   protected function dateStrToArray($date)
   {
-    $array = array('year' => 0, 'month' => 1, 'day' => 1, 'time' => array('type' => 'wallclock', 'seconds' => 0));
+    $array = array('year' => 0, 'month' => 0, 'day' => 1, 'time' => array('type' => 'wallclock', 'seconds' => 0));
     if(preg_match('!(\d{4})(\s+[a-z0-9]+)?(\s+\d+)?(\s+\d[^\s]*)?!i', $date, $match)) {
       $match = array_map('trim', $match);