Changeset 10076

Timestamp:

04/21/08 20:54:54 (7 months ago)

Author:

shimooka

Message:

lang/php/Date_Holidays_Driver_Japanese: fixed building substitute holidays

Location:

lang/php/Date_Holidays_Driver_Japanese

Files:

• build.conf (modified) (1 diff)
• notes.txt (modified) (1 diff)
• sample.php (modified) (2 diffs)
• src/Date/Holidays/Driver/Japanese.php (modified) (3 diffs)

lang/php/Date_Holidays_Driver_Japanese/build.conf

@@ -20 +20 @@
 
 [version]
-release_ver = 0.1.0
+release_ver = 0.1.1
 release_stab = alpha
 api_ver = 0.1.0

lang/php/Date_Holidays_Driver_Japanese/notes.txt

@@ +1 @@
+[0.1.1]
+- Fixed building substitute holidays
+
 [0.1.0]
 - First release

lang/php/Date_Holidays_Driver_Japanese/sample.php

@@ -1295 +1295 @@
 require_once "Date/Holidays.php";
 
-if (false) {
-    $obj =& Date_Holidays::factory('Japanese', 1973);
+if (true) {
+    $obj =& Date_Holidays::factory('Japanese', 2008);
     if (Date_Holidays::isError($obj)) {
         die('Factory was unable to produce driver-object');
@@ -1303 +1303 @@
     foreach ($obj->getHolidayDates() as $holiday) {
         echo $holiday->getDate() . "\n";
+    }
+    for ($i=0;$i<366;$i++) {
+            $t = mktime(0,0,0,1,$i+1,2008);
+            $date = date('Y-m-d', $t);
+            if ($obj->isHoliday($date)) {
+                echo "[{$date}] holiday\n";
+            }
     }
 } else {

lang/php/Date_Holidays_Driver_Japanese/src/Date/Holidays/Driver/Japanese.php

@@ -41 +41 @@
 class Date_Holidays_Driver_Japanese extends Date_Holidays_Driver
 {
+    var $_substituteHolidays = array();
+
     /**
      * Constructor
@@ -63 +65 @@
     {
         parent::_buildHolidays();
+
+        foreach ($this->_substituteHolidays as $internalName) {
+            $this->_removeHoliday($internalName);
+        }
 
         $this->_buildNewYearsDay();
@@ -429 +435 @@
                 }
                 if (!is_null($date)) {
+                    $internalName = 'substituteHolidayFor'
+                                  . str_replace(' ', '', $name);
+                    $this->_substituteHolidays[] = $internalName;
                     $this->_addHoliday(
-                        'substituteHolidayFor' . str_replace(' ', '', $name),
+                        $internalName,
                         $date,
                         'Substitute Holiday for ' . $name);