Changeset 1962
- Timestamp:
- 09/15/07 15:43:30 (1 year ago)
- Files:
-
- trunk/lib/soap/baseData.rb (modified) (1 diff)
- trunk/lib/soap/mapping/literalregistry.rb (modified) (1 diff)
- trunk/lib/xsd/charset.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/soap/baseData.rb
r1958 r1962 767 767 # value is added as an XML element with the key name. 768 768 def self.from_obj(obj, namespace = nil) 769 return obj if obj.is_a?(SOAPElement) 769 770 o = SOAPElement.new(nil) 770 771 case obj trunk/lib/soap/mapping/literalregistry.rb
r1955 r1962 354 354 # untaint depends GenSupport.safemethodname 355 355 name = XSD::CodeGen::GenSupport.safemethodname('xmlattr_' + qname.name).untaint 356 # untaint depends QName#dump 357 qnamedump = qname.dump.untaint 358 obj.instance_eval <<-EOS 359 def #{name} 360 @__xmlattr[#{qnamedump}] 361 end 362 363 def #{name}=(value) 364 @__xmlattr[#{qnamedump}] = value 365 end 366 EOS 356 unless obj.respond_to?(name) 357 # untaint depends QName#dump 358 qnamedump = qname.dump.untaint 359 obj.instance_eval <<-EOS 360 def #{name} 361 @__xmlattr[#{qnamedump}] 362 end 363 364 def #{name}=(value) 365 @__xmlattr[#{qnamedump}] = value 366 end 367 EOS 368 end 367 369 end 368 370 trunk/lib/xsd/charset.rb
r1947 r1962 78 78 } 79 79 80 CharsetStrCache = {} 81 80 82 81 83 ### … … 120 122 def Charset.charset_str(label) 121 123 if CharsetMap.respond_to?(:key) 122 Charset Map.key(label.downcase) || 'X_UNKNOWN'124 CharsetStrCache[label] ||= CharsetMap.key(label.downcase) || 'X_UNKNOWN' 123 125 else 124 Charset Map.index(label.downcase) || 'X_UNKNOWN'126 CharsetStrCache[label] ||= CharsetMap.index(label.downcase) || 'X_UNKNOWN' 125 127 end 126 128 end
