Continued:

[hub.git] / application / hub / main / template / class_BaseXmlTemplateEngine.php

diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php
index d46c5a1b36988c6ffaff249a5566a8ff3fdc0cd4..8d2c54de53f2a064553848775ff4cd00f84e344d 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -2,11 +2,11 @@
 /**
  * A generic XML template engine class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()
  *
  * This program is free software: you can redistribute it and/or modify
@@ -48,6 +48,11 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         */
        private $typePrefix = 'xml';
 
+       /**
+        * Name of stacker
+        */
+       private $stackerName = '';
+
        /**
         * Content from dependency
         */
@@ -110,13 +115,16 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                $this->setCompileOutputPath($this->getConfigInstance()->getConfigEntry('base_path') . $this->getConfigInstance()->getConfigEntry('compile_output_path'));
 
                // Init a variable stacker
-               $stackerInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class');
+               $stackInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class');
+
+               // Set name
+               $this->stackerName = $typePrefix . '_' . $xmlTemplateType;
 
                // Init stacker
-               $stackerInstance->initStacker($typePrefix . '_' . $xmlTemplateType);
+               $stackInstance->initStack($this->stackerName);
 
                // Set it
-               $this->setStackerInstance($stackerInstance);
+               $this->setStackInstance($stackInstance);
 
                // Set XML template type and prefix
                $this->xmlTemplateType = $xmlTemplateType;
@@ -174,6 +182,15 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                return $this->mainNodes;
        }
 
+       /**
+        * Getter for stacker name
+        *
+        * @return      $stackerName    Name of stacker of this class
+        */
+       protected final function getStackerName () {
+               return $this->stackerName;
+       }
+
        /**
         * Getter for sub node array
         *
@@ -194,6 +211,12 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                // Read the variable
                $value = parent::readVariable($key, 'general');
 
+               // Is this null?
+               if (is_null($value)) {
+                       // Bah, needs fixing.
+                       $this->debugInstance('key=' . $key . ' returns NULL');
+               } // END - if
+
                // Return value
                return $value;
        }
@@ -269,7 +292,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         * @return      void
         * @throws      XmlNodeMismatchException        If current main node mismatches the closing one
         */
-       public final function endElement ($resource, $nodeName) {
+       public final function finishElement ($resource, $nodeName) {
                // Make all lower-case
                $nodeName = strtolower($nodeName);