Project 'hub' continued (a little):

- Added missing class constant
- Added missing exception NoRequestNodeListAttemptedException
- Added debug lines

diff --git a/.gitattributes b/.gitattributes
index 010e2b498f5d702bd8741fb7f478b2ac6c098787..2f0b2e8b5a9ddd6982799c9828da922f1acea97e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -32,6 +32,7 @@ application/hub/exceptions/package/class_UnsupportedPackageCodeHandlerException.
 application/hub/exceptions/peer/.htaccess -text svneol=unset#text/plain
 application/hub/exceptions/peer/class_PeerAlreadyRegisteredException.php svneol=native#text/plain
 application/hub/exceptions/requests/.htaccess -text svneol=unset#text/plain
+application/hub/exceptions/requests/class_NoRequestNodeListAttemptedException.php svneol=native#text/plain
 application/hub/exceptions/requests/class_RequestNotAcceptedException.php svneol=native#text/plain
 application/hub/exceptions/resolver/.htaccess svneol=native#text/plain
 application/hub/exceptions/resolver/class_NoValidHostnameException.php svneol=native#text/plain

diff --git a/application/hub/exceptions/requests/class_NoRequestNodeListAttemptedException.php b/application/hub/exceptions/requests/class_NoRequestNodeListAttemptedException.php
new file mode 100644 (file)
index 0000000..e02318e
--- /dev/null
+++ b/application/hub/exceptions/requests/class_NoRequestNodeListAttemptedException.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * This exception is thrown when 
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.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
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 NoRequestNodeListAttemptedException extends FrameworkException {
+       /**
+        * The super constructor for all exceptions
+        *
+        * @param       $messageArray   Error message array
+        * @param       $code                   Error code
+        * @return      void
+        */
+       public function __construct (array $messageData, $code) {
+               // Construct the message
+               $message = sprintf("[%s:%d] This node (%s) didn't except a node-list request: %s",
+                       $messageData[0]->__toString(),
+                       $this->getLine(),
+                       $messageData[1]->__toString(),
+                       print_r($messageData[2], true)
+               );
+
+               // Call parent exception constructor
+               parent::__construct($message, $code);
+       }
+}
+
+// [EOF]
+?>

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index a89050de735ec35fe480d352c4a1ea7de857515c..22d7273b958c566db0a025e45ee83e37390f7901 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -729,9 +729,15 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @todo        Add checking if this node has been announced to the sender node
         */
        public function ifNodeHasAnnounced () {
+               // Debug message
+               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnounced(): state=' . $this->getStateInstance()->getStateName());
+
                // Simply check the state of this node
                $hasAnnounced = ($this->getStateInstance() instanceof NodeAnnouncedState);
 
+               // Debug message
+               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnounced(): hasAnnounced=' . intval($hasAnnounced));
+
                // Return it
                return $hasAnnounced;
        }

diff --git a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
index f44b8091c6c69e24560ca6f03d7d09d03827757d..0a3e44b9df97fe802fb96855256cc9076d76081e 100644 (file)
--- a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
@@ -23,6 +23,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine implements CompileableTemplate, Registerable {
+       // Constants for array elements
+       const REQUEST_DATA_SESSION_ID            = 'session-id';
+
        /**
         * Protected constructor
         *