From bf22fa153c44dc29c6414f41ee63f4c6a3850b15 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Tue, 20 Oct 2009 21:29:32 +0200
Subject: [PATCH] Properly handle and replace wildcards

---
 pywsdlgen/parser.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pywsdlgen/parser.py b/pywsdlgen/parser.py
index 382c320..58cbf69 100644
--- a/pywsdlgen/parser.py
+++ b/pywsdlgen/parser.py
@@ -86,6 +86,11 @@ class Parser(object):
 		ports = ''
 		operations = ''
 
+		if self.name:
+			name = self.name
+		else:
+			name = self.class_name
+
 		for tag, args in self.tags.items():
 			parts = ''
 			result = ''
@@ -108,27 +113,25 @@ class Parser(object):
 			else:
 				messages += '''<message name="%s"/>''' % (tag)
 
-			if args['return']:
-				messages += '''<message name="%sResponse"><part name="return" type="xsd:%s"/></message>''' % \
-					(tag, args['return'])
+			try:
+				arg_type = type_map[arg_types[arguments.index('return')]]
+			except (ValueError, KeyError):
+				arg_type = '***unknown***'
+			messages += '''<message name="%sResponse"><part name="return" type="xsd:%s"/></message>''' % \
+				(tag, arg_type)
 
 			ports += '''<operation name="%s"><input message="tns:%s"/><output message="tns:%sResponse"/></operation>''' % \
 				(tag, tag, tag)
 
-			operations += '''<operation name="%s"><soap:operation soapAction="http://${url}/${name}Service/get_session"/>
-							 <input><soap:body use="literal" namespace="http://${url}/${name}Service"/></input>
-							 <output><soap:body use="literal" namespace="http://${url}/${name}Service"/></output>
-							 </operation>''' % (tag)
+			operations += '<operation name="%(tag)s"><soap:operation soapAction="%(url)s/%(name)sService/get_session"/>' \
+						  '<input><soap:body use="literal" namespace="%(url)s/%(name)sService"/></input>' \
+						  '<output><soap:body use="literal" namespace="%(url)s/%(name)sService"/></output>' \
+						  '</operation>''' % { 'name': name, 'tag': tag, 'url': self.url }
 
 		fp = open(self.template_file, 'r')
 		template = fp.read()
 		fp.close()
 
-		if self.name:
-			name = self.name
-		else:
-			name = self.class_name
-
 		s = Template(template).substitute(
 				name=name,
 				url=self.url,
-- 
2.11.4.GIT