Also this was possibly missing.

[hub.git] / application / hub / main / filter / tags / class_PackageSelfConnectTagFilter.php

diff --git a/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php b/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php
index 3484f34042373db94a853de784da175bc97718a8..3f08a7b6d73dab8305b39b1913c0a1df27967e4c 100644 (file)
--- a/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php
+++ b/application/hub/main/filter/tags/class_PackageSelfConnectTagFilter.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * A SelfConnectTag filter for Package
+ * A SelfConnectTag filter for packages
  *
- * @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 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class PackageSelfConnectTagFilter extends BaseFilter implements FilterablePackage {
-       /**
-        * Array with all data XML nodes (which hold the actual data) and their values
-        */
-       private $dataXmlNodes = array();
-
+class PackageSelfConnectTagFilter extends BaseNodeFilter implements FilterablePackage {
        /**
         * Protected constructor
         *
@@ -83,54 +78,10 @@ class PackageSelfConnectTagFilter extends BaseFilter implements FilterablePackag
         * @param       $messageContent         Raw message content
         * @param       $packageInstance        An instance of a Receivable class
         * @return      void
-        * @todo        Exceptions from renderXmlContent() are currently unhandled
         */
        public function processMessage ($messageContent, Receivable $packageInstance) {
-               // Get a template instance from the factory
-               $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_self_connect_template_class');
-
-               // And render the XML content (aka message)
-               $templateInstance->renderXmlContent($messageContent);
-
-               /*
-                * The template system now stores all required data as 'general'
-                * variables, so simply get them. If there is an invalid XML node
-                * inside the message, the above method call will cause exceptions.
-                */
-               foreach ($this->dataXmlNodes as $key => $dummy) {
-                       // Get the variable from template engine
-                       $value = $templateInstance->readSelfConnectData($key);
-
-                       /*
-                        * If value is NULL, a variable hasn't been found. This could mean
-                        * that *this* node is running an out-dated software or the other
-                        * peer is using an out-dated self_connect.xml template.
-                        */
-                       if (is_null($value)) {
-                               // Output a warning
-                               $this->debugOutput('SELF-CONNECT-TAG: Found not fully supported variable ' . $key . ' - skipping.');
-
-                               // Skip this part, don't write NULLs to the array
-                               continue;
-                       } // END - if
-
-                       // Debug message
-                       //* NOISY-DEBUG: */ $this->debugOutput('SELF-CONNECT-TAG: key=' . $key . ',value=' . $value);
-
-                       // Set it now
-                       $this->dataXmlNodes[$key] = $value;
-               } // END - foreach
-
-               // Construct an array for pushing it on next stack
-               $messageArray = array(
-                       // Message data itself
-                       NetworkPackage::MESSAGE_ARRAY_DATA => $this->dataXmlNodes,
-                       // Message type (which is 'self_connect')
-                       NetworkPackage::MESSAGE_ARRAY_TYPE => 'self_connect'
-               );
-
-               // Push the processed message back on stack
-               $packageInstance->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray);
+               // Process generic
+               $this->genericProcessMessage('self_connect', $messageContent, $packageInstance);
        }
 }