Changeset 1716
- Timestamp:
- 09/09/06 10:34:14 (2 years ago)
- Files:
-
- trunk/lib/soap/rpc/driver.rb (modified) (1 diff)
- trunk/lib/soap/rpc/proxy.rb (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/soap/rpc/driver.rb
r1683 r1716 58 58 __attr_proxy :endpoint_url, true 59 59 __attr_proxy :mapping_registry, true 60 __attr_proxy :allow_unqualified_element, true 60 61 __attr_proxy :default_encodingstyle, true 61 62 __attr_proxy :generate_explicit_type, true 62 __attr_proxy : allow_unqualified_element, true63 __attr_proxy :return_response_as_xml, true 63 64 __attr_proxy :headerhandler 64 65 __attr_proxy :streamhandler trunk/lib/soap/rpc/proxy.rb
r1708 r1716 30 30 attr_accessor :default_encodingstyle 31 31 attr_accessor :generate_explicit_type 32 attr_accessor :return_response_as_xml 32 33 attr_reader :headerhandler 33 34 attr_reader :streamhandler … … 51 52 @default_encodingstyle = nil 52 53 @generate_explicit_type = true 54 @return_response_as_xml = false 53 55 @headerhandler = Header::HandlerSet.new 54 56 @mapping_registry = nil … … 115 117 def invoke(req_header, req_body, opt = nil) 116 118 opt ||= create_encoding_opt 117 route(req_header, req_body, opt, opt) 119 env = route(req_header, req_body, opt, opt) 120 if @return_response_as_xml 121 opt[:response_as_xml] 122 else 123 env 124 end 118 125 end 119 126 … … 150 157 op_info.raise_fault(e, @mapping_registry, @literal_mapping_registry) 151 158 end 152 op_info.response_obj(env.body, @mapping_registry, 153 @literal_mapping_registry, mapping_opt) 159 if @return_response_as_xml 160 resopt[:response_as_xml] 161 else 162 op_info.response_obj(env.body, @mapping_registry, 163 @literal_mapping_registry, mapping_opt) 164 end 154 165 end 155 166 … … 256 267 StreamHandler.parse_media_type(mime.root.headers['content-type'].str) 257 268 env = Processor.unmarshal(mime.root.content, opt) 269 if @return_response_as_xml 270 opt[:response_as_xml] = mime.root.content 271 end 258 272 else 259 273 opt[:charset] = @mandatorycharset || 260 274 ::SOAP::StreamHandler.parse_media_type(contenttype) 261 275 env = Processor.unmarshal(conn_data.receive_string, opt) 276 if @return_response_as_xml 277 opt[:response_as_xml] = conn_data.receive_string 278 end 262 279 end 263 280 unless env.is_a?(::SOAP::SOAPEnvelope)