# HG changeset patch
# User paulb
# Date 1195406527 0
# Node ID 70b6a17e645c07f2a93066d579513111eaaf37ad
# Parent  d136f07fe3609cef1032082ddc86393481104fd6
[project @ 2007-11-18 17:22:07 by paulb]
Moved activity-related methods to the XSLForms.Fields.Form class.

diff -r d136f07fe360 -r 70b6a17e645c XSLForms/Resources/WebResources.py
--- a/XSLForms/Resources/WebResources.py	Sun Nov 18 17:21:57 2007 +0000
+++ b/XSLForms/Resources/WebResources.py	Sun Nov 18 17:22:07 2007 +0000
@@ -353,13 +353,13 @@
         """
 
         documents = form.get_documents()
-        activity = self.get_activity(trans)
+        activity = form.get_activity()
 
         if documents.has_key(activity):
-            self.set_document(trans, documents[activity])
+            form.set_document(documents[activity])
             return 0
         else:
-            self.set_document(trans, form.new_instance(activity))
+            form.set_document(form.new_instance(activity))
             return 1
 
     def respond_to_input(self, trans, form):
@@ -382,11 +382,10 @@
 
         # Transform, adding enumerations/ranges.
 
-        init_xsl = self.prepare_initialiser(self.get_activity(trans))
-        self.set_document(
-            trans,
+        init_xsl = self.prepare_initialiser(form.get_activity())
+        form.set_document(
             self.get_result(
-                [init_xsl], self.get_document(trans), stylesheet_parameters,
+                [init_xsl], form.get_document(), stylesheet_parameters,
                 stylesheet_expressions, references
                 )
             )
@@ -428,27 +427,13 @@
             trans_xsl = self.prepare_fragment(in_page_resource)
             stylesheet_parameters.update(self.prepare_parameters(parameters))
         else:
-            trans_xsl = self.prepare_output(self.get_activity(trans))
+            trans_xsl = self.prepare_output(form.get_activity())
 
         # Complete the response.
 
-        self.send_output(trans, [trans_xsl], self.get_document(trans),
+        self.send_output(trans, [trans_xsl], form.get_document(),
             stylesheet_parameters, stylesheet_expressions, references)
 
-    # Helper methods related to the modular handling of requests.
-
-    def set_activity(self, trans, name):
-        trans.get_attributes()["current_activity"] = name
-
-    def get_activity(self, trans):
-        return trans.get_attributes().get("current_activity")
-
-    def set_document(self, trans, doc):
-        trans.get_attributes()["current_document"] = doc
-
-    def get_document(self, trans):
-        return trans.get_attributes().get("current_document")
-
     # General helper methods.
 
     def add_elements(self, positions, *element_names):