Changeset 1210

Timestamp:

11/02/06 01:19:52 (2 years ago)

Author:

dominik

Message:

add the start year of the final rule to the timezone data refs #62

Files:

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

trunk/src/config/AgaviTimeZoneDataParser.class.php

@@ -325 +325 @@
             $myRules[] = array('time' => $lastRuleEndTime, 'rawOffset' => $gmtOff, 'dstOffset' => $dstOff, 'name' => $format);
           } else {
-            // TODO: !!
+            // TODO: we probably don't need to add the first rule at all, check this!
           }
 
@@ -332 +332 @@
 
         if($lastZoneRule) {
+          if(count($myRules) == 0) {
+            // this should actually never happen!
+            $lastRuleStartYear = self::MIN_YEAR_VALUE;
+          } else {
+            $cal = $this->getContext()->getTranslationManager()->createCalendar();
+            $cal->setTime($myRules[count($myRules) - 1]['time'] * AgaviDateDefinitions::MILLIS_PER_SECOND);
+            // + 1 because this specifies the first year in which the final rule will apply
+            $lastRuleStartYear = $cal->get(AgaviDateDefinitions::YEAR) + 1;
+          }
+
           if($activeSubRules !== null) {
             $cnt = count($activeSubRules);
@@ -338 +348 @@
             }
             if($cnt == 0) {
-              $finalRule = array('type' => 'none', 'offset' => $gmtOff);
+              $finalRule = array('type' => 'none', 'offset' => $gmtOff, 'startYear' => $lastRuleStartYear);
             } else {
               // normalize the keys
@@ -369 +379 @@
                   'type' => AgaviSimpleTimeZone::WALL_TIME,
                 ),
+                'startYear' => $lastRuleStartYear, 
               );
 
@@ -401 +412 @@
             }
           } else {
-            $finalRule = array('type' => 'static', 'name' => $format, 'offset' => $gmtOff);
+            $finalRule = array('type' => 'static', 'name' => $format, 'offset' => $gmtOff, 'startYear' => $lastRuleStartYear);
           }
         }