1.1 --- a/XSLForms/Resources/WebResources.py Fri Jun 20 23:24:43 2008 +0000
1.2 +++ b/XSLForms/Resources/WebResources.py Fri Jun 20 23:26:57 2008 +0000
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 Resources for use with WebStack.
1.6
1.7 -Copyright (C) 2005, 2006, 2007 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2005, 2006, 2007, 2008 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU Lesser General Public License as published by the Free
1.12 @@ -254,7 +254,7 @@
1.13 paths.append(os.path.abspath(os.path.join(self.resource_dir, filename)))
1.14 return paths
1.15
1.16 - def get_in_page_resource(self, trans):
1.17 + def _get_in_page_resource(self, trans):
1.18
1.19 """
1.20 Return the in-page resource being referred to in the given transaction
1.21 @@ -266,6 +266,19 @@
1.22 else:
1.23 return trans.get_path_info().split("/")[-1]
1.24
1.25 + def get_in_page_resource(self, trans):
1.26 +
1.27 + """
1.28 + Return the in-page resource being referred to in the given transaction
1.29 + 'trans' or None if no valid in-page resource is being referenced.
1.30 + """
1.31 +
1.32 + name = self._get_in_page_resource(trans)
1.33 + if self.in_page_resources.has_key(name):
1.34 + return name
1.35 + else:
1.36 + return None
1.37 +
1.38 def respond(self, trans):
1.39
1.40 """
1.41 @@ -359,7 +372,8 @@
1.42 form.set_document(documents[activity])
1.43 return 0
1.44 else:
1.45 - form.set_document(form.new_instance(activity))
1.46 + form.new_document(activity)
1.47 + form.new_documents.add(activity)
1.48 return 1
1.49
1.50 def respond_to_input(self, trans, form):
1.51 @@ -426,7 +440,7 @@
1.52
1.53 stylesheet_parameters = stylesheet_parameters or {}
1.54
1.55 - if in_page_resource in self.in_page_resources.keys():
1.56 + if in_page_resource:
1.57 trans_xsl = self.prepare_fragment(in_page_resource)
1.58 stylesheet_parameters.update(self.prepare_parameters(parameters))
1.59 else: