From 6be40c31f4ab4b114c4d98bc2705da318af8ce4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 22 Aug 2012 19:43:07 +0000 Subject: [PATCH] Added missing dataXmlNodes array, added debug line --- .../filter/tags/class_PackageRequestNodeListTagFilter.php | 6 ++++++ .../main/handler/message-types/class_BaseMessageHandler.php | 3 +++ .../self-connect/class_NodeMessageSelfConnectHandler.php | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php b/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php index f97e76b52..05c27db36 100644 --- a/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php +++ b/application/hub/main/filter/tags/class_PackageRequestNodeListTagFilter.php @@ -30,6 +30,12 @@ class PackageRequestNodeListTagFilter extends BaseNodeFilter implements Filterab protected function __construct () { // Call parent constructor parent::__construct(__CLASS__); + + // Init XML nodes array which contains the required data + $this->dataXmlNodes = array( + XmlRequestNodeListTemplateEngine::REQUEST_DATA_ACCEPTED_OBJECT_TYPES => '', + XmlRequestNodeListTemplateEngine::REQUEST_DATA_SESSION_ID => '', + ); } /** diff --git a/application/hub/main/handler/message-types/class_BaseMessageHandler.php b/application/hub/main/handler/message-types/class_BaseMessageHandler.php index adf444521..882fb4758 100644 --- a/application/hub/main/handler/message-types/class_BaseMessageHandler.php +++ b/application/hub/main/handler/message-types/class_BaseMessageHandler.php @@ -77,6 +77,9 @@ abstract class BaseMessageHandler extends BaseDataHandler { // Search for the node's session id and external IP/hostname + TCP port foreach ($this->searchData as $key) { + // Debug message + //* DEBUG: */ $this->debugOutput('MESSAGE-HANDLER: messageData=' . print_r($messageData,true)); + // Add criteria $searchInstance->addCriteria('node_' . str_replace('my-', '', $key), $messageData[$key]); } // END - foreach diff --git a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php index f537b8ed0..81c7d830a 100644 --- a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php +++ b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php @@ -69,7 +69,7 @@ class NodeMessageSelfConnectHandler extends BaseMessageHandler implements Handle } else { // Something really horrible happened // @TODO Throw an exception here instead of dying - $this->debugInstance(__METHOD__ . ':IDs mismatch! messageData=' . print_r($messageData, true)); + $this->debugInstance(__METHOD__ . ': ids mismatching! messageData=' . print_r($messageData, true)); } } -- 2.39.5