Changeset 1407

Timestamp:

11/30/06 01:36:24 (2 years ago)

Author:

dominik

Message:

fixed some todos

Location:

branches/0.11/src

Files:

• config/AgaviLdmlConfigHandler.class.php (modified) (2 diffs)
• config/AgaviXmlConfigParser.class.php (modified) (1 diff)
• date/AgaviGregorianCalendar.class.php (modified) (1 diff)

branches/0.11/src/config/AgaviLdmlConfigHandler.class.php

@@ -519 +519 @@
 
             if(isset($calendar->fields)) {
-              if(isset($calendar->fields->alias)) {
-                throw new AgaviException('TODO: alias handling in calendar/fields');
-              } else {
-                foreach($calendar->fields as $field) {
-                  $type = $field->getAttribute('type');
-                  if(isset($field->displayName)) {
-                    $data['calendars'][$calendarName]['fields'][$type]['displayName'] = $field->displayName->getValue();
-                  }
-                  if(isset($field->relative)) {
-                    foreach($field as $relative) {
-                      if($relative->getName() == 'relative') {
-                        $data['calendars'][$calendarName]['fields'][$type]['relatives'][$relative->getAttribute('type')] = $relative->getValue();
-                      }
+              foreach($this->getChildsOrAlias($calendar->fields) as $field) {
+                $type = $field->getAttribute('type');
+                if(isset($field->displayName)) {
+                  $data['calendars'][$calendarName]['fields'][$type]['displayName'] = $field->displayName->getValue();
+                }
+                if(isset($field->relative)) {
+                  foreach($field as $relative) {
+                    if($relative->getName() == 'relative') {
+                      $data['calendars'][$calendarName]['fields'][$type]['relatives'][$relative->getAttribute('type')] = $relative->getValue();
                     }
                   }
@@ -652 +648 @@
 
 
-        foreach($cf as $itemLength) {
-          if($itemLength->getName() == 'alias') {
-            throw new AgaviException('TODO: alias handling in calendar/fields');
-          } elseif($itemLength->getName() == 'default') {
+        foreach($this->getChildsOrAlias($cf) as $itemLength) {
+          if($itemLength->getName() == 'default') {
             $data['numbers']['currencyFormats']['default'] = $itemLength->getAttribute('choice');
           } elseif($itemLength->getName() == 'currencyFormatLength') {
             $itemLengthName = $itemLength->getAttribute('type', '__default');
 
-            foreach($itemLength as $itemFormat) {
-              if($itemFormat->getName() == 'alias') {
-                // TODO: alias handling
-                throw new AgaviException('TODO: alias handling in calendar/fields');
-                continue;
-              } elseif($itemFormat->getName() == 'currencyFormat') {
+            foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
+              if($itemFormat->getName() == 'currencyFormat') {
                 if(isset($itemFormat->pattern)) {
                   $data['numbers']['currencyFormats'][$itemLengthName] = $itemFormat->pattern->getValue();

branches/0.11/src/config/AgaviXmlConfigParser.class.php

@@ -114 +114 @@
     
     if($validationFile) {
-      // TODO: check for file existance
+      if(!is_readable($validationFile)) {
+        $error = 'Validation file "' . $validationFile . '" for configuration file "' . $config . '" does not exist or is unreadable';
+        throw new AgaviUnreadableException($error);
+      }
       $this->errors = array();
       set_error_handler(array($this, 'errorHandler'));

branches/0.11/src/date/AgaviGregorianCalendar.class.php

@@ -175 +175 @@
     // of day or timezone component, and it used to compare against other
     // pure date values.
-    // TODO: check howto use date ...
     $cutoverDay = (int) floor($this->fGregorianCutover / AgaviDateDefinitions::MILLIS_PER_DAY);
     $this->fNormalizedGregorianCutover = $cutoverDay * AgaviDateDefinitions::MILLIS_PER_DAY;