Changeset 1447

Timestamp:

12/31/06 00:11:26 (2 years ago)

Author:

dominik

Message:

allow multiple <settings> blocks which can define a prefix to their settings (defaults to 'core.')
closes #375

Location:

branches/0.11/src/config

Files:

• AgaviConfigValueHolder.class.php (modified) (2 diffs)
• AgaviSettingConfigHandler.class.php (modified) (1 diff)
• xsd/settings.xsd (modified) (4 diffs)

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

@@ -180 +180 @@
    * Returns the children of this value.
    *
+   * @param      string Return only the childs matching this node (tag) name.
+   *
    * @return     array An array with the childs of this value.
    *
@@ -185 +187 @@
    * @since      0.11.0
    */
-  public function getChildren()
-  {
-    return $this->_childs;
+  public function getChildren($nodename = null)
+  {
+    if($nodename === null) {
+      return $this->_childs;
+    } else {
+      $childs = array();
+      foreach($this->_childs as $child) {
+        if($child->getName() == $nodename) {
+          $childs[] = $child;
+        }
+      }
+
+      return $childs;
+    }
   }
 

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

@@ -66 +66 @@
 
       if(isset($cfg->settings)) {
-        foreach($cfg->settings as $setting)
-        {
-          $data['core.' . $setting->getAttribute('name')] = $this->literalize($setting->getValue());
+        $multiSettings = $cfg->getChildren('settings');
+        foreach($multiSettings as $settings) {
+          $prefix = $settings->getAttribute('prefix', 'core.');
+          foreach($settings as $setting)
+          {
+            $data[$prefix . $setting->getAttribute('name')] = $this->literalize($setting->getValue());
+          }
         }
       }

branches/0.11/src/config/xsd/settings.xsd

@@ -6 +6 @@
       <xs:element name="configuration" minOccurs="0" maxOccurs="unbounded">
         <xs:complexType>
-          <xs:all>
-            <xs:element name="system_actions" type="system_actions" minOccurs="0" />
-            <xs:element name="settings" type="settings" minOccurs="0" />
-            <xs:element name="exception_templates" type="exception_templates" minOccurs="0" />
-          </xs:all>
+          <xs:sequence minOccurs="0" maxOccurs="unbounded" >
+            <xs:group ref="system_actions" minOccurs="0" />
+            <xs:group ref="settings" minOccurs="0" maxOccurs="unbounded" />
+            <xs:group ref="exception_templates" minOccurs="0" />
+          </xs:sequence>
           <xs:attribute name="environment" type="xs:string" />
         </xs:complexType>
@@ -17 +17 @@
     <xs:attribute name="parent" type="xs:string" />
   </xs:complexType>
+
+  <xs:group name="system_actions">
+    <xs:choice>
+      <xs:element name="system_actions" type="system_actions" minOccurs="0" />
+      <xs:element name="system_action" type="system_action" minOccurs="0" maxOccurs="unbounded" />
+    </xs:choice>
+  </xs:group>
 
   <xs:complexType name="system_actions">
@@ -31 +38 @@
   </xs:complexType>
 
+  <xs:group name="settings">
+    <xs:choice>
+      <xs:element name="settings" type="settings" minOccurs="0" />
+      <xs:element name="setting" type="setting" minOccurs="0" maxOccurs="unbounded" />
+    </xs:choice>
+  </xs:group>
+
   <xs:complexType name="settings">
     <xs:sequence>
       <xs:element name="setting" type="setting" maxOccurs="unbounded" />
     </xs:sequence>
+    <xs:attribute name="prefix" type="xs:string" />
   </xs:complexType>
   <xs:complexType name="setting">
@@ -43 +58 @@
     </xs:simpleContent>
   </xs:complexType>
+
+  <xs:group name="exception_templates">
+    <xs:choice>
+      <xs:element name="exception_templates" type="exception_templates" minOccurs="0" />
+      <xs:element name="exception_template" type="exception_template" minOccurs="0" maxOccurs="unbounded" />
+    </xs:choice>
+  </xs:group>
 
   <xs:complexType name="exception_templates">