Changeset 1397
- Timestamp:
- 01/23/05 11:58:59 (4 years ago)
- Files:
-
- trunk/lib/soap/wsdlDriver.rb (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/soap/wsdlDriver.rb
r1373 r1397 1 1 # SOAP4R - SOAP WSDL driver 2 # Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.2 # Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>. 3 3 4 4 # This program is copyrighted free software by NAKAMURA, Hiroshi. You can … … 49 49 end 50 50 if service.nil? 51 raise FactoryError.new(" Service #{ servicename } not found in WSDL.")51 raise FactoryError.new("service #{ servicename } not found in WSDL") 52 52 end 53 53 port = if portname … … 57 57 end 58 58 if port.nil? 59 raise FactoryError.new(" Port #{ portname } not found in WSDL.")59 raise FactoryError.new("port #{ portname } not found in WSDL") 60 60 end 61 61 if port.soap_address.nil? 62 raise FactoryError.new("soap:address element not found in WSDL .")62 raise FactoryError.new("soap:address element not found in WSDL") 63 63 end 64 64 WSDLDriver.new(@wsdl, port, @logdev) … … 223 223 set_wiredump_file_base(name) 224 224 unless op_info = @operation[name] 225 raise MethodDefinitionError, "Method: #{name} not defined."225 raise RuntimeError, "method: #{name} not defined" 226 226 end 227 227 req_header = create_request_header … … 231 231 :decode_typemap => @rpc_decode_typemap}) 232 232 env = @proxy.invoke(req_header, req_body, opt) 233 raise EmptyResponseError.new(" Empty response.") unless env233 raise EmptyResponseError.new("empty response") unless env 234 234 receive_headers(env.header) 235 235 begin … … 256 256 req_body = body_from_obj(body_obj, op_info) 257 257 env = @proxy.invoke(req_header, req_body, op_info.soapaction || @soapaction, @wsdl_types) 258 raise EmptyResponseError.new(" Empty response.") unless env258 raise EmptyResponseError.new("empty response") unless env 259 259 if env.body.fault 260 260 raise ::SOAP::FaultError.new(env.body.fault) … … 276 276 :decode_typemap => @wsdl_types}) 277 277 env = @proxy.invoke(req_header, req_body, opt) 278 raise EmptyResponseError.new(" Empty response.") unless env278 raise EmptyResponseError.new("empty response") unless env 279 279 if env.body.fault 280 280 raise ::SOAP::FaultError.new(env.body.fault) … … 357 357 nil 358 358 else 359 raise RuntimeError.new(" No header definition in schema.")359 raise RuntimeError.new("no header definition in schema") 360 360 end 361 361 elsif op_info.headerparts.size == 1 … … 392 392 nil 393 393 else 394 raise RuntimeError.new(" No body found in schema.")394 raise RuntimeError.new("no body found in schema") 395 395 end 396 396 elsif op_info.bodyparts.size == 1 … … 426 426 when :rpc 427 427 parts_names = op_info.bodyparts.collect { |part| part.name } 428 orgname = op_info.op_name.name 429 if orgname != name and orgname.capitalize == name.capitalize 430 add_rpc_method_interface(orgname, parts_names) 431 end 428 432 add_rpc_method_interface(name, parts_names) 429 433 else