Removed answer-status from XML templates as it will become generic

diff --git a/application/hub/main/filter/tags/answer/class_PackageRequestNodeListAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageRequestNodeListAnswerTagFilter.php
index bca37da046965c213a099e86f8b0c1a337d6f4ef..a271bde08f75a261e34a5e4ca653bd8826edc03f 100644 (file)
--- a/application/hub/main/filter/tags/answer/class_PackageRequestNodeListAnswerTagFilter.php
+++ b/application/hub/main/filter/tags/answer/class_PackageRequestNodeListAnswerTagFilter.php
@@ -33,8 +33,9 @@ class PackageRequestNodeListAnswerTagFilter extends BaseNodeFilter implements Fi
 
                // Init array
                $this->dataXmlNodes = array(
-                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID => '',
-                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_NODE_LIST  => '',
+                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_SESSION_ID    => '',
+                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_NODE_LIST     => '',
+                       XmlRequestNodeListAnswerTemplateEngine::REQUEST_DATA_ANSWER_STATUS => '',
                );
        }
 

diff --git a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
index ec365a4aa6ef633fc2e7a2a3979aa8dbbdd6589d..ea2f1ea75bb569e0bdb519998be46ab2b2215a9b 100644 (file)
--- a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
@@ -24,8 +24,9 @@
  */
 class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlTemplateEngine implements CompileableTemplate, Registerable {
        // Constants for array elements
-       const REQUEST_DATA_SESSION_ID = 'session-id';
-       const REQUEST_DATA_NODE_LIST  = 'node-list';
+       const REQUEST_DATA_SESSION_ID    = 'session-id';
+       const REQUEST_DATA_NODE_LIST     = 'node-list';
+       const REQUEST_DATA_ANSWER_STATUS = 'answer-status';
 
        /**
         * Protected constructor

diff --git a/application/hub/templates/xml/answer/announcement/announcement_answer.xml b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
index 706869311eff01ad9d89a816a60ee1c4407efab7..36c79018281230fc79ed5fd5da8f7fb359a2f93d 100644 (file)
--- a/application/hub/templates/xml/answer/announcement/announcement_answer.xml
+++ b/application/hub/templates/xml/answer/announcement/announcement_answer.xml
@@ -70,9 +70,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                //-->
                <your-session-id>{?your_session_id?}</your-session-id>
        </your-data>
-       <!--
-       Status of this answer. This can be something like OKAY if all went fine or
-       any other error code.
-       //-->
-       <answer-status>{?answer_status?}</answer-status>
 </announcement-answer>