Moved setter/getter and attribute itself 'packageTags' to a more generic class BaseHu...

[hub.git] / application / hub / main / helper / hub / requests / class_NodeRequestNodeListHelper.php

diff --git a/application/hub/main/helper/hub/requests/class_NodeRequestNodeListHelper.php b/application/hub/main/helper/hub/requests/class_NodeRequestNodeListHelper.php
index 900352bd354b3414fa1dda81790f99a4fc7108d3..ed31fac0ae6d6dea1282d6ca3ba3bbaf70b03f82 100644 (file)
--- a/application/hub/main/helper/hub/requests/class_NodeRequestNodeListHelper.php
+++ b/application/hub/main/helper/hub/requests/class_NodeRequestNodeListHelper.php
@@ -34,6 +34,9 @@ class NodeRequestNodeListHelper extends BaseHubHelper implements HelpableHub {
 
                // Set recipient type
                $this->setRecipientType(NetworkPackage::NETWORK_TARGET_UPPER_NODES);
+
+               // Set package tags
+               $this->setPackageTags(array('request_node_list'));
        }
 
        /**
@@ -79,7 +82,7 @@ class NodeRequestNodeListHelper extends BaseHubHelper implements HelpableHub {
         */
        public function sendPackage (NodeHelper $nodeInstance) {
                // Sanity check: Is the node in the approx. state? (active)
-               $nodeInstance->getStateInstance()->validateNodeStateIsActive();
+               $nodeInstance->getStateInstance()->validateNodeStateIsAnnouncementCompleted();
 
                // Compile the template, this inserts the loaded node data into the gaps.
                $this->getTemplateInstance()->compileTemplate();
@@ -88,7 +91,7 @@ class NodeRequestNodeListHelper extends BaseHubHelper implements HelpableHub {
                $packageInstance = NetworkPackageFactory::createNetworkPackageInstance();
 
                // Next, feed the content in. The network package class is a pipe-through class.
-               $packageInstance->enqueueRawDataFromTemplate($this);
+               $packageInstance->enqueueRawDataFromTemplate($this, NetworkPackage::PROTOCOL_TCP);
        }
 }