(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.21 and 1.25.2.2

version 1.21, 2005/12/19 21:51:37 version 1.25.2.2, 2006/11/17 18:18:31
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 51 
Line 53 
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 static char LANGUAGE_TAG_SEPARATOR_CHAR = '-'; static char LANGUAGE_TAG_SEPARATOR_CHAR = '-';
   static char LOCALE_ID_SEPARATOR_CHAR = '_';
  
 AcceptLanguages LanguageParser::parseAcceptLanguageHeader(  AcceptLanguageList LanguageParser::parseAcceptLanguageHeader(
     const String& acceptLanguageHeader)     const String& acceptLanguageHeader)
 { {
     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseAcceptLanguageHeader");     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseAcceptLanguageHeader");
  
     AcceptLanguages acceptLanguages;      AcceptLanguageList acceptLanguages;
  
     try     try
     {     {
Line 84 
Line 87 
     return acceptLanguages;     return acceptLanguages;
 } }
  
 ContentLanguages LanguageParser::parseContentLanguageHeader(  ContentLanguageList LanguageParser::parseContentLanguageHeader(
     const String& contentLanguageHeader)     const String& contentLanguageHeader)
 { {
     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseContentLanguageHeader");     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseContentLanguageHeader");
  
     ContentLanguages contentLanguages;      ContentLanguageList contentLanguages;
  
     try     try
     {     {
Line 158 
Line 161 
             "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));          // Do not localize message.  Requiring a language tag for this
           // localization can cause recursion with the MessageLoader.
           throw Exception(parms.toString());
     }     }
  
     if (subtags.size() == 1)     if (subtags.size() == 1)
Line 179 
Line 184 
             "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));          // Do not localize message.  Requiring a language tag for this
           // localization can cause recursion with the MessageLoader.
           throw Exception(parms.toString());
     }     }
  
     if (isStandardFormat)     if (isStandardFormat)
Line 221 
Line 228 
 } }
  
 String LanguageParser::buildAcceptLanguageHeader( String LanguageParser::buildAcceptLanguageHeader(
     const AcceptLanguages& acceptLanguages)      const AcceptLanguageList& acceptLanguages)
 { {
     String alString;     String alString;
     Uint32 numAcceptLanguages = acceptLanguages.size();     Uint32 numAcceptLanguages = acceptLanguages.size();
Line 249 
Line 256 
 } }
  
 String LanguageParser::buildContentLanguageHeader( String LanguageParser::buildContentLanguageHeader(
     const ContentLanguages& contentLanguages)      const ContentLanguageList& contentLanguages)
 { {
     String clString;     String clString;
     Uint32 numContentLanguages = contentLanguages.size();     Uint32 numContentLanguages = contentLanguages.size();
Line 267 
Line 274 
     return clString;     return clString;
 } }
  
 AcceptLanguages LanguageParser::getDefaultAcceptLanguages()  #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()
 { {
 #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();
Line 276 
Line 296 
     char* tmp = (char*)default_loc.getName();     char* tmp = (char*)default_loc.getName();
     char tmp_[100];     char tmp_[100];
     EtoA(strcpy(tmp_,tmp));     EtoA(strcpy(tmp_,tmp));
     try      String localeId = tmp_;
     {  
         return AcceptLanguages(tmp_);  
     }  
 # else # else
       String localeId = default_loc.getName();
   # endif
   
     try     try
     {     {
         return AcceptLanguages(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,
Line 294 
Line 314 
                "format");                "format");
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
             e.getMessage());             e.getMessage());
         return AcceptLanguages("*");          AcceptLanguageList al;
           al.insert(LanguageTag("*"), 1);
           return al;
     }     }
   #else
       return AcceptLanguageList();
 #endif #endif
   
     return AcceptLanguages();  
 } }
  
 void LanguageParser::_parseLanguageHeader( void LanguageParser::_parseLanguageHeader(
Line 447 
Line 469 
                 "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));              // Do not localize message.  Requiring a language tag for this
               // localization can cause recursion with the MessageLoader.
               throw Exception(parms.toString());
         }         }
     }     }
  

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