Development of 'hub' project continued:

[hub.git] / application / hub / main / package / class_NetworkPackage.php

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index 81f262119f17f74b4907a499ea5021166ea6b5b4..e060c32f9238c09f7145a067fb9d75f5e0c4ed19 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -132,9 +132,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
        const PACKAGE_RECIPIENT_SEPARATOR = ':';
 
        /**
-        * Network target (alias): 'upper hubs'
+        * Network target (alias): 'upper nodes'
         */
-       const NETWORK_TARGET_UPPER_HUBS = 'upper';
+       const NETWORK_TARGET_UPPER_NODES = 'upper';
 
        /**
         * Network target (alias): 'self'
@@ -802,7 +802,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function handleIncomingRawData () {
+       public function handleIncomingDecodedData () {
                /*
                 * This method should only be called if decoded raw data is pending,
                 * so check it again.
@@ -907,11 +907,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function assembleRawDataToPackage () {
+       public function assembleDecodedDataToPackage () {
                // Make sure the raw decoded package data is handled
                assert($this->isIncomingRawDataHandled());
 
-               // Get current package content (an array with two elements; see handleIncomingRawData() for details)
+               // Get current package content (an array with two elements; see handleIncomingDecodedData() for details)
                $packageContent = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED);
 
                // Start assembling the raw package data array by chunking it
@@ -1121,6 +1121,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                // Create a handler instance from given message type
                $handlerInstance = MessageTypeHandlerFactory::createMessageTypeHandlerInstance($messageArray[self::MESSAGE_ARRAY_TYPE]);
 
+               // Add type for later easier handling
+               $messageArray[self::MESSAGE_ARRAY_DATA][self::MESSAGE_ARRAY_TYPE] = $messageArray[self::MESSAGE_ARRAY_TYPE];
+
                // Handle message data
                $handlerInstance->handleMessageData($messageArray[self::MESSAGE_ARRAY_DATA], $this);
        }