Added basic XML elements (not all fully supported)

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 24d0db998ce9bc90c377de8b1eaa116ed97685f8..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

diff --git a/application/hub/main/handler/message-types/class_BaseMessageHandler.php b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
index 0e6c6bfe663f52b16170889d154c1ae23e87c5c7..7770d236b39bd613c4163a46d8341ed3d28622c3 100644 (file)
--- a/application/hub/main/handler/message-types/class_BaseMessageHandler.php
+++ b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
@@ -68,7 +68,6 @@ abstract class BaseMessageHandler extends BaseDataHandler {
        protected function registerNodeByMessageData (array $messageData) {
                // Check if searchData has entries
                assert(count($this->searchData) > 0);
-               self::createDebugInstance(__CLASS__)->debugOutput('messageData=' . print_r($messageData, true));
 
                // Get a wrapper instance
                $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_list_db_wrapper_class');

diff --git a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
index 0a3e44b9df97fe802fb96855256cc9076d76081e..fd0bf4520929160e414e72271bc8ed248b8bcd9c 100644 (file)
--- a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
@@ -24,7 +24,8 @@
  */
 class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine implements CompileableTemplate, Registerable {
        // Constants for array elements
-       const REQUEST_DATA_SESSION_ID            = 'session-id';
+       const REQUEST_DATA_SESSION_ID = 'my-session-id';
+       const REQUEST_DATA_NODE_LIST  = 'node-list';
 
        /**
         * Protected constructor
@@ -37,7 +38,8 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine imple
 
                // Init sub-nodes array
                $this->subNodes = array(
-                       XmlRequestNodeListTemplateEngine::REQUEST_DATA_SESSION_ID,
+                       self::REQUEST_DATA_SESSION_ID,
+                       self::REQUEST_DATA_NODE_LIST,
                );
        }
 

diff --git a/application/hub/templates/xml/answer/requests/request_node_list_answer.xml b/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
index b7e0bd2f4581b53ad44011c2a581000a3463bca4..fbdeb9fbcaca893c743a2132ded92248fa5fda97 100644 (file)
--- a/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
+++ b/application/hub/templates/xml/answer/requests/request_node_list_answer.xml
@@ -22,4 +22,12 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <request-node-list-answer>
+       <!--
+       My session id
+       //-->
+       <my-session-id>{?my_session_id?}</my-session-id>
+       <!--
+       List of all nodes (will be completed later)
+       //-->
+       <node-list />
 </request-node-list-answer>