# HG changeset patch
# User paulb
# Date 1116200014 0
# Node ID 5ebe3aa4850bc627f887281462dcc68ca563f32c
# Parent  9185ed6e5bd4343667861aedf6f48e28301ac30a
[project @ 2005-05-15 23:33:34 by paulb]
Fixed variable name retrieval.

diff -r 9185ed6e5bd4 -r 5ebe3aa4850b XSLForms/Output.py
--- a/XSLForms/Output.py	Sun May 15 19:54:13 2005 +0000
+++ b/XSLForms/Output.py	Sun May 15 23:33:34 2005 +0000
@@ -80,14 +80,13 @@
     """
 
     context = libxml2mod.xmlXPathParserGetContext(context)
-    #context = libxsltmod.xsltXPathGetTransformContext(pctxt)
     transform_context = libxsltmod.xsltXPathGetTransformContext(context)
     name_var = libxsltmod.xsltVariableLookup(transform_context, "this-name", None)
     if multivalue_name is not None:
         name = multivalue_name
         multivalue = 1
     elif name_var is not None:
-        name = name_var[0].content
+        name = libxml2mod.xmlNodeGetContent(name_var[0])
         multivalue = 0
     else:
         name = None
@@ -96,22 +95,27 @@
     return path_to_node(node, attribute_ref, name, multivalue)
 
 def this_position(context):
+    #print "this_position"
     r = path_to_context(context, 0)
     return r.encode("utf-8")
 
 def field_name(context):
+    #print "field_name"
     r = path_to_context(context, 1)
     return r.encode("utf-8")
 
 def multi_field_name(context, multivalue_name):
+    #print "multi_field_name"
     r = path_to_context(context, 1, multivalue_name)
     return r.encode("utf-8")
 
 def new_field(context, name):
+    #print "new_field"
     r = path_to_context(context, 0) + "/" + name
     return r.encode("utf-8")
 
 def other_field_names(context, nodes):
+    #print "other_field_names"
     names = []
     for node in nodes:
         name = path_to_node(libxml2dom.Node(node), 0, None, 0)
@@ -121,6 +125,7 @@
     return r.encode("utf-8")
 
 def other_multi_field_names(context, multivalue_name, nodes):
+    #print "other_multi_field_names"
     names = []
     for node in nodes:
         name = path_to_node(libxml2dom.Node(node), 1, multivalue_name, 1)