Changeset 1598
- Timestamp:
- 07/26/05 23:15:54 (3 years ago)
- Files:
-
- trunk/lib/xsd/charset.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/xsd/charset.rb
r1596 r1598 25 25 EncodingConvertMap = {} 26 26 def Charset.init 27 EncodingConvertMap[['UTF8', 'X_ISO8859_1']] = 28 Proc.new { |str| str.unpack('U*').pack('C*') } 29 EncodingConvertMap[['X_ISO8859_1', 'UTF8']] = 30 Proc.new { |str| str.unpack('C*').pack('U*') } 27 31 begin 28 32 require 'xsd/iconvcharset' … … 70 74 'SJIS' => 'shift_jis', 71 75 'UTF8' => 'utf-8', 76 'X_ISO_8859_1' => 'iso-8859-1', 77 'X_UNKNOWN' => nil, 72 78 } 73 79 … … 114 120 def Charset.charset_str(label) 115 121 if CharsetMap.respond_to?(:key) 116 CharsetMap.key(label.downcase) 122 CharsetMap.key(label.downcase) || 'X_UNKNOWN' 117 123 else 118 CharsetMap.index(label.downcase) 124 CharsetMap.index(label.downcase) || 'X_UNKNOWN' 119 125 end 120 126 end