1.1 --- a/XSLForms/Resources.py Tue Oct 04 23:37:42 2005 +0000
1.2 +++ b/XSLForms/Resources.py Tue Oct 04 23:38:14 2005 +0000
1.3 @@ -141,14 +141,16 @@
1.4 XSLForms.Prepare.ensure_stylesheet_fragment(output_path, fragment_path, node_identifier)
1.5 return fragment_path
1.6
1.7 - def send_output(self, trans, stylesheet_filenames, document, stylesheet_parameters=None, references=None):
1.8 + def send_output(self, trans, stylesheet_filenames, document, stylesheet_parameters=None,
1.9 + stylesheet_expressions=None, references=None):
1.10
1.11 """
1.12 Send the output from the resource to the user employing the transaction
1.13 'trans', stylesheets having the given 'stylesheet_filenames', the
1.14 'document' upon which the output will be based, the optional parameters
1.15 - as defined in the 'stylesheet_parameters' dictionary, and the optional
1.16 - 'references' to external documents.
1.17 + as defined in the 'stylesheet_parameters' dictionary, the optional
1.18 + expressions are defined in the 'stylesheet_expressions' dictionary, and
1.19 + the optional 'references' to external documents.
1.20 """
1.21
1.22 # Sanity check for the filenames list.
1.23 @@ -156,18 +158,21 @@
1.24 if isinstance(stylesheet_filenames, str) or isinstance(stylesheet_filenames, unicode):
1.25 raise ValueError, stylesheet_filenames
1.26
1.27 - proc = XSLOutput.Processor(stylesheet_filenames, parameters=stylesheet_parameters, references=references)
1.28 + proc = XSLOutput.Processor(stylesheet_filenames, parameters=stylesheet_parameters,
1.29 + expressions=stylesheet_expressions, references=references)
1.30 proc.send_output(trans.get_response_stream(), trans.get_response_stream_encoding(),
1.31 document)
1.32
1.33 - def get_result(self, stylesheet_filenames, document, stylesheet_parameters=None, references=None):
1.34 + def get_result(self, stylesheet_filenames, document, stylesheet_parameters=None,
1.35 + stylesheet_expressions=None, references=None):
1.36
1.37 """
1.38 Get the result of applying a transformation using stylesheets with the
1.39 given 'stylesheet_filenames', the 'document' upon which the result will
1.40 be based, the optional parameters as defined in the
1.41 - 'stylesheet_parameters' dictionary, and the optional 'references' to
1.42 - external documents.
1.43 + 'stylesheet_parameters' dictionary, the optional parameters as defined
1.44 + in the 'stylesheet_parameters' dictionaryand the optional 'references'
1.45 + to external documents.
1.46 """
1.47
1.48 # Sanity check for the filenames list.
1.49 @@ -175,7 +180,8 @@
1.50 if isinstance(stylesheet_filenames, str) or isinstance(stylesheet_filenames, unicode):
1.51 raise ValueError, stylesheet_filenames
1.52
1.53 - proc = XSLOutput.Processor(stylesheet_filenames, parameters=stylesheet_parameters, references=references)
1.54 + proc = XSLOutput.Processor(stylesheet_filenames, parameters=stylesheet_parameters,
1.55 + expressions=stylesheet_expressions, references=references)
1.56 return proc.get_result(document)
1.57
1.58 def prepare_initialiser(self, input_identifier):