sets the right gid for level1_auth in the genitable

[sfa.git] / wsdl / gw2wsdl.py

diff --git a/wsdl/gw2wsdl.py b/wsdl/gw2wsdl.py
index 1ddf04e..4ee1257 100755 (executable)
--- a/wsdl/gw2wsdl.py
+++ b/wsdl/gw2wsdl.py
@@ -54,8 +54,8 @@ def fold_complex_type_names(acc, arg):
     if (type(acc)==list):
         acc.append(name)
     else:
-        python_is_braindead = acc.doc
-        acc = [python_is_braindead,name]
+        p_i_b = acc.doc
+        acc = [p_i_b,name]
     return acc
 
 def fold_complex_type(acc, arg):
@@ -65,8 +65,8 @@ def fold_complex_type(acc, arg):
     if (type(acc)==list):
         acc.append(name)
     else:
-        python_is_braindead = name_complex_type(acc)
-        acc = [python_is_braindead,name]
+        p_i_b = name_complex_type(acc)
+        acc = [p_i_b,name]
     return acc
 
 def name_complex_type(arg):
@@ -104,12 +104,18 @@ def name_complex_type(arg):
         inner_type = name_complex_type(arg[0]) 
         num_types=num_types+1
         type_name = "Type%d"%num_types
-        complex_type = types_section.appendChild(types.createElement("xsd:simpleType"))
+        complex_type = types_section.appendChild(types.createElement("xsd:complexType"))
         type_name = filter_argname(type_name)
         complex_type.setAttribute("name", type_name)
-        complex_content = complex_type.appendChild(types.createElement("xsd:list"))
-        complex_content.setAttribute("itemType",inner_type)
+        complex_content = complex_type.appendChild(types.createElement("xsd:complexContent"))
+        restriction = complex_content.appendChild(types.createElement("xsd:restriction"))
+        restriction.setAttribute("base","soapenc:Array")
+        attribute = restriction.appendChild(types.createElement("xsd:attribute"))
+        attribute.setAttribute("ref","soapenc:arrayType")
+        attribute.setAttribute("wsdl:arrayType","%s[]"%inner_type)
+
         return "xsdl:%s"%type_name
+
     elif type(arg) == DictType or arg == DictType or (inspect.isclass(arg) and issubclass(arg, dict)):
         num_types=num_types+1
         type_name = "Type%d"%num_types
@@ -189,7 +195,7 @@ def add_wsdl_ports_and_bindings (wsdl):
         out_el = wsdl.firstChild.appendChild(wsdl.createElement("message"))
         out_el.setAttribute("name", method + "_out")
         ret_part = out_el.appendChild(wsdl.createElement("part"))
-        ret_part.setAttribute("name", "returnvalue")
+        ret_part.setAttribute("name", "Result")
         ret_part.setAttribute("type", param_type(return_type))
 
         # Port connecting arguments with return type
@@ -266,7 +272,7 @@ def get_wsdl_definitions():
         xmlns:xsdl="%s/2009/07/schema"
         xmlns:tns="%s/2009/07/sfa.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding"
+        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
         """ % (globals.plc_ns,globals.plc_ns,globals.plc_ns)
         
@@ -284,7 +290,7 @@ def get_wsdl_definitions_and_types():
         xmlns:xsdl="%s/2009/07/schema"
         xmlns:tns="%s/2009/07/sfa.wsdl"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding"
+        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
         <types>
             <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="%s/2009/07/schema"/>