Added template class for entries in a request-node-list

[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 2086623d995ec0971eb38c336808e388a181fe73..d46c5a1b36988c6ffaff249a5566a8ff3fdc0cd4 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -113,7 +113,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                $stackerInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class');
 
                // Init stacker
-               $stackerInstance->initStacker($xmlTemplateType);
+               $stackerInstance->initStacker($typePrefix . '_' . $xmlTemplateType);
 
                // Set it
                $this->setStackerInstance($stackerInstance);
@@ -129,15 +129,21 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
        /**
         * Load a specified XML template into the engine
         *
-        * @param       $template       The XML template we shall load
+        * @param       $templateName   Optional name of template
         * @return      void
         */
-       public function loadXmlTemplate ($template) {
+       public function loadXmlTemplate ($templateName = '') {
+               // Is the template name empty?
+               if (empty($templateName)) {
+                       // Set generic template name
+                       $templateName = $this->typePrefix . '_' . $this->xmlTemplateType . '_template_type';
+               } // END - if
+
                // Set template type
-               $this->setTemplateType($this->getConfigInstance()->getConfigEntry($this->xmlTemplateType . '_template_type'));
+               $this->setTemplateType($this->getConfigInstance()->getConfigEntry($templateName));
 
                // Load the special template
-               $this->loadTemplate($template);
+               $this->loadTemplate($this->xmlTemplateType);
        }
 
        /**
@@ -177,6 +183,21 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                return $this->subNodes;
        }
 
+       /**
+        * Read XML variables by calling readVariable() with 'general' as
+        * variable stack.
+        *
+        * @param       $key    Key to read from
+        * @return      $value  Value from variable
+        */
+       public function readXmlData ($key) {
+               // Read the variable
+               $value = parent::readVariable($key, 'general');
+
+               // Return value
+               return $value;
+       }
+
        /**
         * Handles the template dependency for given node
         *
@@ -185,16 +206,16 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         * @return      void
         */
        protected function handleTemplateDependency ($node, $templateDependency) {
+               // Check that node is not empty
+               assert(!empty($node));
+
                // Is the template dependency set?
                if ((!empty($templateDependency)) && (!isset($this->dependencyContent[$node]))) {
                        // Get a temporay template instance
-                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '__' . $this->xmlTemplateType . '_template_class');
-
-                       // Create method name
-                       $methodName = 'load' . $this->convertToClassName($this->xmlTemplateType) . 'Template';
+                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '_' . $this->convertDashesToUnderscores($node) . '_' . $this->xmlTemplateType . '_template_class');
 
                        // Then load it
-                       call_user_func(array($templateInstance, $methodName), $templateDependency);
+                       $templateInstance->loadXmlTemplate($templateDependency);
 
                        // Parse the XML content
                        $templateInstance->renderXmlContent();