diff --git a/OpenChange/Codepages.m b/OpenChange/Codepages.m index d8574f9c5..8776ffe22 100644 --- a/OpenChange/Codepages.m +++ b/OpenChange/Codepages.m @@ -31,57 +31,57 @@ { /* http://msdn.microsoft.com/en-us/library/dd317756%28v=vs.85%29.aspx */ table = [[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt: 37], @"IBM037", - [NSNumber numberWithInt: 437], @"IBM437", - [NSNumber numberWithInt: 500], @"IBM500", - [NSNumber numberWithInt: 708], @"ASMO-708", - [NSNumber numberWithInt: 720], @"DOS-720", + [NSNumber numberWithInt: 37], @"ibm037", + [NSNumber numberWithInt: 437], @"ibm437", + [NSNumber numberWithInt: 500], @"ibm500", + [NSNumber numberWithInt: 708], @"asmo-708", + [NSNumber numberWithInt: 720], @"dos-720", [NSNumber numberWithInt: 737], @"ibm737", [NSNumber numberWithInt: 775], @"ibm775", [NSNumber numberWithInt: 850], @"ibm850", [NSNumber numberWithInt: 852], @"ibm852", - [NSNumber numberWithInt: 855], @"IBM855", + [NSNumber numberWithInt: 855], @"ibm855", [NSNumber numberWithInt: 857], @"ibm857", - [NSNumber numberWithInt: 858], @"IBM00858", - [NSNumber numberWithInt: 860], @"IBM860", + [NSNumber numberWithInt: 858], @"ibm00858", + [NSNumber numberWithInt: 860], @"ibm860", [NSNumber numberWithInt: 861], @"ibm861", - [NSNumber numberWithInt: 862], @"DOS-862", - [NSNumber numberWithInt: 863], @"IBM863", - [NSNumber numberWithInt: 864], @"IBM864", - [NSNumber numberWithInt: 865], @"IBM865", + [NSNumber numberWithInt: 862], @"dos-862", + [NSNumber numberWithInt: 863], @"ibm863", + [NSNumber numberWithInt: 864], @"ibm864", + [NSNumber numberWithInt: 865], @"ibm865", [NSNumber numberWithInt: 866], @"cp866", [NSNumber numberWithInt: 869], @"ibm869", - [NSNumber numberWithInt: 870], @"IBM870", + [NSNumber numberWithInt: 870], @"ibm870", [NSNumber numberWithInt: 874], @"windows-874", [NSNumber numberWithInt: 875], @"cp875", [NSNumber numberWithInt: 932], @"shift_jis", [NSNumber numberWithInt: 936], @"gb2312", [NSNumber numberWithInt: 949], @"ks_c_5601-1987", [NSNumber numberWithInt: 950], @"big5", - [NSNumber numberWithInt: 1026], @"IBM1026", - [NSNumber numberWithInt: 1047], @"IBM01047", - [NSNumber numberWithInt: 1140], @"IBM01140", - [NSNumber numberWithInt: 1141], @"IBM01141", - [NSNumber numberWithInt: 1142], @"IBM01142", - [NSNumber numberWithInt: 1143], @"IBM01143", - [NSNumber numberWithInt: 1144], @"IBM01144", - [NSNumber numberWithInt: 1145], @"IBM01145", - [NSNumber numberWithInt: 1146], @"IBM01146", - [NSNumber numberWithInt: 1147], @"IBM01147", - [NSNumber numberWithInt: 1148], @"IBM01148", - [NSNumber numberWithInt: 1149], @"IBM01149", + [NSNumber numberWithInt: 1026], @"ibm1026", + [NSNumber numberWithInt: 1047], @"ibm01047", + [NSNumber numberWithInt: 1140], @"ibm01140", + [NSNumber numberWithInt: 1141], @"ibm01141", + [NSNumber numberWithInt: 1142], @"ibm01142", + [NSNumber numberWithInt: 1143], @"ibm01143", + [NSNumber numberWithInt: 1144], @"ibm01144", + [NSNumber numberWithInt: 1145], @"ibm01145", + [NSNumber numberWithInt: 1146], @"ibm01146", + [NSNumber numberWithInt: 1147], @"ibm01147", + [NSNumber numberWithInt: 1148], @"ibm01148", + [NSNumber numberWithInt: 1149], @"ibm01149", [NSNumber numberWithInt: 1200], @"utf-16", - [NSNumber numberWithInt: 1201], @"unicodeFFFE", + [NSNumber numberWithInt: 1201], @"unicodefffe", [NSNumber numberWithInt: 1250], @"windows-1250", [NSNumber numberWithInt: 1251], @"windows-1251", - [NSNumber numberWithInt: 1252], @"Windows-1252", + [NSNumber numberWithInt: 1252], @"windows-1252", [NSNumber numberWithInt: 1253], @"windows-1253", [NSNumber numberWithInt: 1254], @"windows-1254", [NSNumber numberWithInt: 1255], @"windows-1255", [NSNumber numberWithInt: 1256], @"windows-1256", [NSNumber numberWithInt: 1257], @"windows-1257", [NSNumber numberWithInt: 1258], @"windows-1258", - [NSNumber numberWithInt: 1361], @"Johab", + [NSNumber numberWithInt: 1361], @"johab", [NSNumber numberWithInt: 10000], @"macintosh", [NSNumber numberWithInt: 10001], @"x-mac-japanese", [NSNumber numberWithInt: 10002], @"x-mac-chinesetrad", @@ -99,39 +99,39 @@ [NSNumber numberWithInt: 10081], @"x-mac-turkish", [NSNumber numberWithInt: 10082], @"x-mac-croatian", [NSNumber numberWithInt: 12000], @"utf-32", - [NSNumber numberWithInt: 12001], @"utf-32BE", - [NSNumber numberWithInt: 20000], @"x-Chinese-CNS", + [NSNumber numberWithInt: 12001], @"utf-32be", + [NSNumber numberWithInt: 20000], @"x-chinese-cns", [NSNumber numberWithInt: 20001], @"x-cp20001", - [NSNumber numberWithInt: 20002], @"x-Chinese-Eten", + [NSNumber numberWithInt: 20002], @"x-chinese-eten", [NSNumber numberWithInt: 20003], @"x-cp20003", [NSNumber numberWithInt: 20004], @"x-cp20004", [NSNumber numberWithInt: 20005], @"x-cp20005", - [NSNumber numberWithInt: 20105], @"x-IA5", - [NSNumber numberWithInt: 20106], @"x-IA5-German", - [NSNumber numberWithInt: 20107], @"x-IA5-Swedish", - [NSNumber numberWithInt: 20108], @"x-IA5-Norwegian", + [NSNumber numberWithInt: 20105], @"x-ia5", + [NSNumber numberWithInt: 20106], @"x-ia5-german", + [NSNumber numberWithInt: 20107], @"x-ia5-swedish", + [NSNumber numberWithInt: 20108], @"x-ia5-norwegian", [NSNumber numberWithInt: 20127], @"us-ascii", [NSNumber numberWithInt: 20261], @"x-cp20261", [NSNumber numberWithInt: 20269], @"x-cp20269", - [NSNumber numberWithInt: 20273], @"IBM273", - [NSNumber numberWithInt: 20277], @"IBM277", - [NSNumber numberWithInt: 20278], @"IBM278", - [NSNumber numberWithInt: 20280], @"IBM280", - [NSNumber numberWithInt: 20284], @"IBM284", - [NSNumber numberWithInt: 20285], @"IBM285", - [NSNumber numberWithInt: 20290], @"IBM290", - [NSNumber numberWithInt: 20297], @"IBM297", - [NSNumber numberWithInt: 20420], @"IBM420", - [NSNumber numberWithInt: 20423], @"IBM423", - [NSNumber numberWithInt: 20424], @"IBM424", - [NSNumber numberWithInt: 20833], @"x-EBCDIC-KoreanExtended", - [NSNumber numberWithInt: 20838], @"IBM-Thai", + [NSNumber numberWithInt: 20273], @"ibm273", + [NSNumber numberWithInt: 20277], @"ibm277", + [NSNumber numberWithInt: 20278], @"ibm278", + [NSNumber numberWithInt: 20280], @"ibm280", + [NSNumber numberWithInt: 20284], @"ibm284", + [NSNumber numberWithInt: 20285], @"ibm285", + [NSNumber numberWithInt: 20290], @"ibm290", + [NSNumber numberWithInt: 20297], @"ibm297", + [NSNumber numberWithInt: 20420], @"ibm420", + [NSNumber numberWithInt: 20423], @"ibm423", + [NSNumber numberWithInt: 20424], @"ibm424", + [NSNumber numberWithInt: 20833], @"x-ebcdic-koreanextended", + [NSNumber numberWithInt: 20838], @"ibm-thai", [NSNumber numberWithInt: 20866], @"koi8-r", - [NSNumber numberWithInt: 20871], @"IBM871", - [NSNumber numberWithInt: 20880], @"IBM880", - [NSNumber numberWithInt: 20905], @"IBM905", - [NSNumber numberWithInt: 20924], @"IBM00924", - [NSNumber numberWithInt: 20932], @"EUC-JP", + [NSNumber numberWithInt: 20871], @"ibm871", + [NSNumber numberWithInt: 20880], @"ibm880", + [NSNumber numberWithInt: 20905], @"ibm905", + [NSNumber numberWithInt: 20924], @"ibm00924", + [NSNumber numberWithInt: 20932], @"euc-jp", [NSNumber numberWithInt: 20936], @"x-cp20936", [NSNumber numberWithInt: 20949], @"x-cp20949", [NSNumber numberWithInt: 21025], @"cp1025", @@ -147,18 +147,18 @@ [NSNumber numberWithInt: 28599], @"iso-8859-9", [NSNumber numberWithInt: 28603], @"iso-8859-13", [NSNumber numberWithInt: 28605], @"iso-8859-15", - [NSNumber numberWithInt: 29001], @"x-Europa", + [NSNumber numberWithInt: 29001], @"x-europa", [NSNumber numberWithInt: 38598], @"iso-8859-8-i", [NSNumber numberWithInt: 50220], @"iso-2022-jp", - [NSNumber numberWithInt: 50221], @"csISO2022JP", + [NSNumber numberWithInt: 50221], @"csiso2022jp", [NSNumber numberWithInt: 50222], @"iso-2022-jp", [NSNumber numberWithInt: 50225], @"iso-2022-kr", [NSNumber numberWithInt: 50227], @"x-cp50227", [NSNumber numberWithInt: 51932], @"euc-jp", - [NSNumber numberWithInt: 51936], @"EUC-CN", + [NSNumber numberWithInt: 51936], @"euc-cn", [NSNumber numberWithInt: 51949], @"euc-kr", [NSNumber numberWithInt: 52936], @"hz-gb-2312", - [NSNumber numberWithInt: 54936], @"GB18030", + [NSNumber numberWithInt: 54936], @"gb18030", [NSNumber numberWithInt: 57002], @"x-iscii-de", [NSNumber numberWithInt: 57003], @"x-iscii-be", [NSNumber numberWithInt: 57004], @"x-iscii-ta", @@ -203,7 +203,7 @@ + (NSNumber *) getCodepageFromName: (NSString *) name { - return [[self getCodepagesTable] objectForKey: name]; + return [[self getCodepagesTable] objectForKey: [name lowercaseString]]; } + (NSString *) getNameFromCodepage: (NSNumber *) codepage