From e5a3aba50e2bd7e0327aacd8fe1ab7963fc4a007 Mon Sep 17 00:00:00 2001
From: nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 20 Dec 2004 13:50:15 +0000
Subject:         * added files:           * lib/soap/mapping/wsdl*.rb         
  * lib/wsdl/soap/element.rb           * lib/wsdl/xmlSchema/simpleContent.rb

        * modified files:
          * lib/soap/*
          * lib/wsdl/*
          * lib/xsd/*
          * test/soap/*
          * test/wsdl/*
          * test/xsd/*

        * summary
          * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2

          * added several XSD basetype support: nonPositiveInteger,
            negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
            unsignedShort, unsignedByte, positiveInteger

          * HTTP client connection/send/receive timeout support.

          * HTTP client/server gzipped content encoding support.

          * improved WSDL schema definition support; still is far from
            complete, but is making step by step improovement.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/wsdl/xmlSchema/attribute.rb | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'lib/wsdl/xmlSchema/attribute.rb')

diff --git a/lib/wsdl/xmlSchema/attribute.rb b/lib/wsdl/xmlSchema/attribute.rb
index e5046dd991..6861fc171e 100644
--- a/lib/wsdl/xmlSchema/attribute.rb
+++ b/lib/wsdl/xmlSchema/attribute.rb
@@ -33,10 +33,13 @@ class Attribute < Info
     @type = nil
     @default = nil
     @fixed = nil
-
     @arytype = nil
   end
 
+  def targetnamespace
+    parent.targetnamespace
+  end
+
   def parse_element(element)
     nil
   end
@@ -46,23 +49,23 @@ class Attribute < Info
     when RefAttrName
       @ref = value
     when UseAttrName
-      @use = value
+      @use = value.source
     when FormAttrName
-      @form = value
+      @form = value.source
     when NameAttrName
-      @name = value
+      @name = XSD::QName.new(targetnamespace, value.source)
     when TypeAttrName
       @type = value
     when DefaultAttrName
-      @default = value
+      @default = value.source
     when FixedAttrName
-      @fixed = value
+      @fixed = value.source
     when ArrayTypeAttrName
-      @arytype = if value.is_a?(XSD::QName)
-	  value
-	else
-	  XSD::QName.new(XSD::Namespace, value)
-	end
+      @arytype = if value.namespace.nil?
+          XSD::QName.new(XSD::Namespace, value.source)
+        else
+          value
+        end
     else
       nil
     end
-- 
cgit v1.2.3