(file) Return to LanguageParser.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/LanguageParser.cpp between version 1.22.2.1 and 1.32

version 1.22.2.1, 2006/02/10 16:09:37 version 1.32, 2008/01/08 20:15:10
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Humberto Rivero (hurivero@us.ibm.com)  
 //  
 // Modified By: Aruran, IBM (ashanmug@in.ibm.com) for Bug# 3697, 3698, 3699, 3700  
 //              Aruran, IBM (ashanmug@in.ibm.com) for Bug# 3701, 3702, 3703, 3704  
 //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <Pegasus/Common/LanguageParser.h> #include <Pegasus/Common/LanguageParser.h>
 #include <Pegasus/Common/InternalException.h> #include <Pegasus/Common/InternalException.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n  #include <Pegasus/Common/MessageLoader.h>
 #include <cstring> #include <cstring>
  
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
 # include <unicode/locid.h> # include <unicode/locid.h>
 #endif #endif
 #if defined(PEGASUS_OS_OS400)  
 # include "OS400ConvertChar.h"  
 #endif  
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 static char LANGUAGE_TAG_SEPARATOR_CHAR = '-'; static char LANGUAGE_TAG_SEPARATOR_CHAR = '-';
   static char LOCALE_ID_SEPARATOR_CHAR = '_';
  
 AcceptLanguageList LanguageParser::parseAcceptLanguageHeader( AcceptLanguageList LanguageParser::parseAcceptLanguageHeader(
     const String& acceptLanguageHeader)     const String& acceptLanguageHeader)
Line 74 
Line 66 
             Real32 qualityValue;             Real32 qualityValue;
             LanguageParser::_parseAcceptLanguageElement(             LanguageParser::_parseAcceptLanguageElement(
                 languageElements[i], languageTagString, qualityValue);                 languageElements[i], languageTagString, qualityValue);
             acceptLanguages.insert(LanguageTag(languageTagString), qualityValue);              acceptLanguages.insert(
                   LanguageTag(languageTagString), qualityValue);
         }         }
     }     }
     catch (Exception& e)     catch (Exception& e)
Line 160 
Line 153 
             "Common.LanguageParser.INVALID_LANGUAGE_TAG",             "Common.LanguageParser.INVALID_LANGUAGE_TAG",
             "Invalid language tag \"$0\".", languageTagString);             "Invalid language tag \"$0\".", languageTagString);
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw Exception(MessageLoader::getMessage(parms));          // throw Exception(MessageLoader::getMessage(parms));
           // do not localize message, requires a language tag for this
           // localization can cause recursion here
           throw Exception(parms.toString());
     }     }
  
     if (subtags.size() == 1)     if (subtags.size() == 1)
Line 181 
Line 177 
             "Common.LanguageParser.INVALID_LANGUAGE_TAG",             "Common.LanguageParser.INVALID_LANGUAGE_TAG",
             "Invalid language tag \"$0\".", languageTagString);             "Invalid language tag \"$0\".", languageTagString);
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw Exception(MessageLoader::getMessage(parms));          // throw Exception(MessageLoader::getMessage(parms));
           // do not localize message, requires a language tag for this
           // localization can cause recursion here
           throw Exception(parms.toString());
     }     }
  
     if (isStandardFormat)     if (isStandardFormat)
Line 269 
Line 268 
     return clString;     return clString;
 } }
  
   #ifdef PEGASUS_HAS_ICU
   String& LanguageParser::convertLocaleIdToLanguageTag(String& localeId)
   {
       Uint32 index = 0;
       while ((index = localeId.find(index, LOCALE_ID_SEPARATOR_CHAR)) !=
                   PEG_NOT_FOUND)
       {
           localeId[index] = LANGUAGE_TAG_SEPARATOR_CHAR;
       }
       return localeId;
   }
   #endif
   
 AcceptLanguageList LanguageParser::getDefaultAcceptLanguages() AcceptLanguageList LanguageParser::getDefaultAcceptLanguages()
 { {
 #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU) #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU)
     Locale default_loc = Locale::getDefault();     Locale default_loc = Locale::getDefault();
  
 # ifdef PEGASUS_OS_OS400      String localeId = default_loc.getName();
     char* tmp = (char*)default_loc.getName();  
     char tmp_[100];  
     EtoA(strcpy(tmp_,tmp));  
     try  
     {  
         return LanguageParser::parseAcceptLanguageHeader(tmp_);  
     }  
 # else  
     try     try
     {     {
         return LanguageParser::parseAcceptLanguageHeader(default_loc.getName());          return LanguageParser::parseAcceptLanguageHeader(
               convertLocaleIdToLanguageTag(localeId));
     }     }
 # endif  
     catch (const InvalidAcceptLanguageHeader& e)     catch (const InvalidAcceptLanguageHeader& e)
     {     {
         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
            "src.Server.cimserver.FAILED_TO_GET_PROCESS_LOCALE",              "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",
            "Could not convert the system locale to a valid accept-language "              "Cannot convert the system process locale into a valid "
                "format");                  "Accept-Language format.");
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
             e.getMessage());             e.getMessage());
         AcceptLanguageList al;         AcceptLanguageList al;
Line 451 
Line 456 
                 "Common.LanguageParser.MALFORMED_LANGUAGE_TAG",                 "Common.LanguageParser.MALFORMED_LANGUAGE_TAG",
                 "Malformed language tag \"$0\".", languageTagString);                 "Malformed language tag \"$0\".", languageTagString);
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             throw Exception(MessageLoader::getMessage(parms));              // throw Exception(MessageLoader::getMessage(parms));
               // do not localize message, requires a language tag for this
               // localization can cause recursion here
               throw Exception(parms.toString());
         }         }
     }     }
  

Legend:
Removed from v.1.22.2.1  
changed lines
  Added in v.1.32
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2