(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.36.8.1

version 1.21, 2005/12/19 21:51:37 version 1.36.8.1, 2013/06/03 22:35:12
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software 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
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 // 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 = '-';
  
 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 72 
Line 63 
             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 84 
Line 76 
     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 154 
Line 146 
     {     {
         // Except for "i" and "x", primary tags must be 2 or 3 characters,         // Except for "i" and "x", primary tags must be 2 or 3 characters,
         // according to RFC 3066.         // according to RFC 3066.
         MessageLoaderParms parms(  
             "Common.LanguageParser.INVALID_LANGUAGE_TAG",          // Do not localize this message; it could cause recursion.
             "Invalid language tag \"$0\".", languageTagString);  
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw Exception(MessageLoader::getMessage(parms));          throw Exception(Formatter::format(
               "Invalid language tag \"$0\".",
               languageTagString));
     }     }
  
     if (subtags.size() == 1)     if (subtags.size() == 1)
Line 175 
Line 168 
     {     {
         // The second subtag may not be a single character according to         // The second subtag may not be a single character according to
         // RFC 3066.         // RFC 3066.
         MessageLoaderParms parms(  
             "Common.LanguageParser.INVALID_LANGUAGE_TAG",          // Do not localize this message; it could cause recursion.
             "Invalid language tag \"$0\".", languageTagString);  
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw Exception(MessageLoader::getMessage(parms));          throw Exception(Formatter::format(
               "Invalid language tag \"$0\".",
               languageTagString));
     }     }
  
     if (isStandardFormat)     if (isStandardFormat)
Line 221 
Line 215 
 } }
  
 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 243 
 } }
  
 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 261 
     return clString;     return clString;
 } }
  
 AcceptLanguages LanguageParser::getDefaultAcceptLanguages()  #ifdef PEGASUS_HAS_ICU
   String& LanguageParser::convertLocaleIdToLanguageTag(String& localeId)
   {
       static char LOCALE_ID_SEPARATOR_CHAR = '_';
       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();
  
 # ifdef PEGASUS_OS_OS400      String localeId = default_loc.getName();
     char* tmp = (char*)default_loc.getName();  
     char tmp_[100];  
     EtoA(strcpy(tmp_,tmp));  
     try  
     {  
         return AcceptLanguages(tmp_);  
     }  
 # else  
     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,
            "src.Server.cimserver.FAILED_TO_GET_PROCESS_LOCALE",              MessageLoaderParms(
            "Could not convert the system locale to a valid accept-language "                  "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",
                "format");                  "Cannot convert the system process locale into a valid "
                       "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());
         return AcceptLanguages("*");          AcceptLanguageList al;
           al.insert(LanguageTag("*"), 1);
           return al;
     }     }
   #else
       return AcceptLanguageList();
 #endif #endif
   
     return AcceptLanguages();  
 } }
  
 void LanguageParser::_parseLanguageHeader( void LanguageParser::_parseLanguageHeader(
Line 443 
Line 447 
         if (((i == 0) && !_isValidPrimarySubtagSyntax(subtags[i])) ||         if (((i == 0) && !_isValidPrimarySubtagSyntax(subtags[i])) ||
             ((i > 0) && !_isValidSubtagSyntax(subtags[i])))             ((i > 0) && !_isValidSubtagSyntax(subtags[i])))
         {         {
               // throw Exception(MessageLoader::getMessage(parms));
               // do not localize message, requires a language tag for this
               // localization can cause recursion here
               // MessageLoaderParms::toString adds 5kb static code size, Do NOT
               // include in non-debug builds
   #ifdef PEGASUS_DEBUG
             MessageLoaderParms parms(             MessageLoaderParms parms(
                 "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(parms.toString());
   #else
               String malFormed("Malformed language tag:");
               malFormed.append(languageTagString);
               PEG_METHOD_EXIT();
               throw Exception(malFormed);
   #endif
         }         }
     }     }
  


Legend:
Removed from v.1.21  
changed lines
  Added in v.1.36.8.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2