Changeset 1047

Timestamp:

11/15/03 12:52:02 (5 years ago)

Author:

nahi

Message:

add driver#mandatorycharset interface to foce using charset for parsing

response from buggy server.

Files:

• trunk/lib/soap/rpc/driver.rb (modified) (2 diffs)
• trunk/lib/soap/rpc/proxy.rb (modified) (3 diffs)
• trunk/lib/soap/wsdlDriver.rb (modified) (4 diffs)

trunk/lib/soap/rpc/driver.rb

@@ -48 +48 @@
-    @wiredump_dev = nil
-    @wiredump_file_base = nil
-
+
+
-    @handler = HTTPPostStreamHandler.new(@endpoint_url, @httpproxy,
-      XSD::Charset.encoding_label)
@@ -81 +82 @@
-      @handler.reset
-    end
+  end
+
+  def mandatorycharset
+    @proxy.mandatorycharset
+  end
+
+  def mandatorycharset=(mandatorycharset)
+    @proxy.mandatorycharset = mandatorycharset
-  end
-

trunk/lib/soap/rpc/proxy.rb

@@ -36 +36 @@
-
-  attr_accessor :soapaction
-
+
+
+
-  attr_reader :method
-
@@ -43 +45 @@
-    @soapaction = soapaction
-    @method = {}
+    @mandatorycharset = nil
-    @allow_unqualified_element = false
-    @default_encodingstyle = nil
@@ -105 +108 @@
-      return nil, nil
-    end
-    res_charset = StreamHandler.parse_media_type(data.receive_contenttype)
-    opt = create_options
-
+
+
-    res_header, res_body = Processor.unmarshal(data.receive_string, opt)
-    return res_header, res_body

trunk/lib/soap/wsdlDriver.rb

@@ -106 +106 @@
-  __attr_proxy :wiredump_file_base, true
-  __attr_proxy :httpproxy, true
+  __attr_proxy :mandatorycharset, true          # force using charset
-
-  __attr_proxy :default_encodingstyle, true
@@ -130 +131 @@
-    attr_reader :wiredump_file_base
-    attr_reader :httpproxy
+    attr_accessor :mandatorycharset
-
-    attr_accessor :default_encodingstyle
@@ -226 +228 @@
-      name = 'http_proxy'
-      @httpproxy = ENV[name] || ENV[name.upcase]
+      @mandatorycharset = nil
-
-      @wsdl_elements = @wsdl.collect_elements
@@ -362 +365 @@
-        return nil, nil
-      end
-res_charset = StreamHandler.parse_media_type(data.receive_contenttype)
-
+opt[:charset] = @mandatorycharset ||
+
-      res_header, res_body = Processor.unmarshal(data.receive_string, opt)
-      return res_header, res_body