Changeset 1893

Timestamp:

07/21/07 12:54:01 (1 year ago)

Author:

nahi

Message:

• check illegal constant name before const_defined? call to avoid warnings. closes #386.
  

Files:

• trunk/lib/soap/rpc/element.rb (modified) (3 diffs)
• trunk/lib/soap/wsdlDriver.rb (modified) (2 diffs)

trunk/lib/soap/rpc/element.rb

@@ -220 +220 @@
-  def init_param(param_def)
-    param_def.each do |io_type, name, param_type|
-
-
-
-
+
-      if nsdef && namedef
-        type_qname = XSD::QName.new(nsdef, namedef)
@@ -244 +241 @@
-        end
-        @retval_name = name
-        @retval_class_name = nil
-        @retval_class_name = mapped_class
-      else
@@ -250 +246 @@
-      end
-    end
+  end
+
+  def self.parse_param_type(param_type)
+    mapped_class, nsdef, namedef = param_type
+    # the first element of typedef in param_def can be a String like
+    # "::SOAP::SOAPStruct" or "CustomClass[]".  turn this String to a class if
+    # we can.
+    if mapped_class.is_a?(String)
+      if /\[\]\Z/ =~ mapped_class
+        # when '[]' is added, ignore this.
+        mapped_class = nil
+      else
+        mapped_class = Mapping.class_from_name(mapped_class)
+      end
+    end
+    [mapped_class, nsdef, namedef]
-  end
-end

trunk/lib/soap/wsdlDriver.rb

@@ -27 +27 @@
-  def initialize(wsdl)
-    @wsdl = import(wsdl)
-
+, {}
-  end
-  
@@ -134 +134 @@
-    # the first element of typedef in param_def is a String like
-    # "::SOAP::SOAPStruct".  turn this String to a class.
-
-
-
+
+
-    }
-  end