Added basic XML elements (not all fully supported)

[hub.git] / application / hub / main / handler / message-types / answer / class_NodeMessageRequestNodeListAnswerHandler.php

diff --git a/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php b/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
index a5605a5571a5ad7c48e46bc124d061dfaf622041..93942b8b85ced90121ba1fae510c0a3a3873ae03 100644 (file)
--- a/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
+++ b/application/hub/main/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
@@ -37,6 +37,7 @@ class NodeMessageRequestNodeListAnswerHandler extends BaseMessageHandler impleme
                // Init message data array
                $this->messageDataElements = array(
                        XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID,
+                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_NODE_LIST,
                );
 
                // Init message-data->configuration translation array
@@ -83,7 +84,7 @@ class NodeMessageRequestNodeListAnswerHandler extends BaseMessageHandler impleme
                $nodeInstance = Registry::getRegistry()->getInstance('node');
 
                // Has this node attempted to announce itself?
-               if (!$nodeInstance->ifNodeHasAnnounced()) {
+               if (!$nodeInstance->ifNodeHasAnnouncementCompleted()) {
                        /*
                         * This node has never announced itself, so it doesn't expect
                         * request-node-list answer messages.
@@ -106,8 +107,14 @@ class NodeMessageRequestNodeListAnswerHandler extends BaseMessageHandler impleme
         * @return      void
         */
        public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $messageData) {
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('ANSWER-HANDLER: messageData=' . print_r($messageData, true));
+
                // Add all ements
                foreach ($this->messageDataElements as $key) {
+                       // Debug message
+                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('ANSWER-HANDLER: messageData[' . $key . ']=' . $messageData[$key]);
+
                        // Is it there?
                        assert(isset($messageData[$key]));