Changeset 2581

Timestamp:

07/07/08 04:38:07 (6 months ago)

Author:

david

Message:

Now setting "matched" attribute flags on appropriate <configuration> elements. And some cleanup. Refs #519, #710

Location:

branches/david-xml_only_config_system/src/config

Files:

• AgaviXmlConfigParser.class.php (modified) (8 diffs)
• dom/AgaviXmlConfigDomDocument.class.php (modified) (2 diffs)

branches/david-xml_only_config_system/src/config/AgaviXmlConfigParser.class.php

@@ -47 +47 @@
    */
   public static $agaviEnvelopeNamespaces = array(
-    self::AGAVI_ENVELOPE_NAMESPACE_1_0 => 'ae10',
+    self::AGAVI_ENVELOPE_NAMESPACE_1_0 => 'agavi_envelope_1_0',
   );
   
@@ -74 +74 @@
    */
   protected $xpath = null;
+  
+  /**
+   * Test if the given document looks like an Agavi config file.
+   *
+   * @param      DOMDocument The document to test.
+   *
+   * @return     bool True, if it is an Agavi config document, false otherwise.
+   *
+   * @author     David Zülke <david.zuelke@bitextender.com>
+   * @since      1.0.0
+   */
+  public static function isAgaviConfigurationDocument(DOMDocument $doc)
+  {
+    return $doc->documentElement && $doc->documentElement->localName == 'configurations' && self::isAgaviEnvelopeNamespace($doc->documentElement->namespaceURI);
+  }
   
   /**
@@ -117 +132 @@
       // make sure it (still) is a <configurations> file with the proper agavi namespace
       if($isAgaviConfigFormat) {
-        $isAgaviConfigFormat = $doc->documentElement && $doc->documentElement->localName == 'configurations' && self::isAgaviEnvelopeNamespace($doc->documentElement->namespaceURI);
+        $isAgaviConfigFormat = self::isAgaviConfigurationDocument($doc);
       }
       
@@ -161 +176 @@
     
       $configurationOrder = array(
-        'count(self::node()[not(@environment) and not(@context)])',
-        'count(self::node()[@environment and not(@context)])',
-        'count(self::node()[not(@environment) and @context])',
-        'count(self::node()[@environment and @context])',
+        'count(self::node()[@agavi_envelope_1_0:matched and not(@environment) and not(@context)])',
+        'count(self::node()[@agavi_envelope_1_0:matched and @environment and not(@context)])',
+        'count(self::node()[@agavi_envelope_1_0:matched and not(@environment) and @context])',
+        'count(self::node()[@agavi_envelope_1_0:matched and @environment and @context])',
       );
       $testAttributes = array(
@@ -175 +190 @@
         foreach($configurationElements as &$element) {
           if($element->ownerDocument->xpath->evaluate($xpath, $element)) {
-            foreach($testAttributes as $attributeName => $attributeValue) {
-              // TODO: move that method or something
-              if($element->hasAttribute($attributeName) && !self::testPattern($element->getAttribute($attributeName), $attributeValue)) {
-                continue 2;
-              }
-            }
             $importedNode = $retval->importNode($element, true);
             $retval->documentElement->appendChild($importedNode);
@@ -241 +250 @@
     libxml_clear_errors();
     
-    $this->doc = new DOMDocument();
+    $this->doc = new AgaviXmlConfigDomDocument();
     $this->doc->load($path);
     
@@ -302 +311 @@
   
   /**
-   * Prepare the configuration file, resolve XIncludes, and validate embedded
-   * XML Schemas.
+   * Prepare the configuration file: resolve XIncludes, validate against XML
+   * Schema instances declared on the document, and set processing information
+   * flags on <configuration> elements.
    *
    * @author     David Zülke <dz@bitxtender.com>
@@ -393 +403 @@
       }
       $this->validateXmlschemaSource($schemas);
+    }
+    
+    if($this->doc->isAgaviConfiguration()) {
+      $testAttributes = array(
+        'context' => $this->context,
+        'environment' => $this->environment,
+      );
+      
+      foreach($this->doc->getConfigurationElements() as $configuration) {
+        $matched = true;
+        foreach($testAttributes as $attributeName => $attributeValue) {
+          if($configuration->hasAttribute($attributeName)) {
+            $matched = $matched && self::testPattern($configuration->getAttribute($attributeName), $attributeValue);
+          }
+        }
+        if($matched) {
+          $configuration->setAttributeNS(self::AGAVI_ENVELOPE_NAMESPACE_LATEST, 'matched', 'true');
+        }
+      }
     }
   }

branches/david-xml_only_config_system/src/config/dom/AgaviXmlConfigDomDocument.class.php

@@ -135 +135 @@
   public function isAgaviConfiguration()
   {
-    return AgaviXmlConfigParser::isAgaviEnvelopeNamespace($this->documentElement->namespaceURI);
+    return AgaviXmlConfigParser::isAgaviConfigurationDocument($this);
   }
   
@@ -166 +166 @@
     $retval = array();
     
-    if($this->isAgaviConfigurationFile()) {
+    if($this->isAgaviConfiguration()) {
       $agaviNs = $this->getAgaviEnvelopeNamespace();