(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.12 and 1.20

version 1.12, 2005/05/30 12:46:15 version 1.20, 2005/06/06 08:28:15
Line 29 
Line 29 
 // //
 // Author: Humberto Rivero (hurivero@us.ibm.com) // Author: Humberto Rivero (hurivero@us.ibm.com)
 // //
 // Modified By: Aruran, IBM (ashanmug@in.ibm.com) for Bug# 3697  // 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
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 65 
Line 66 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
 } }
  
 Real32 LanguageParser::parseAcceptLanguageValue(String &language_tag, String & hdr){  Real32 LanguageParser::parseAcceptLanguageValue(String &language_tag, String hdr){
         // look for ';' in hdr, that means we have a quality value to capture         // look for ';' in hdr, that means we have a quality value to capture
     // if not, we only have a language     // if not, we only have a language
  
Line 132 
Line 133 
         return quality;         return quality;
 } }
  
 String LanguageParser::parseContentLanguageValue(String & hdr){  String LanguageParser::parseContentLanguageValue(const String& hdr){
         // we are looking for the language part of the hdr only,         // we are looking for the language part of the hdr only,
         // according to the RFC, there may be parenthesized strings         // according to the RFC, there may be parenthesized strings
         // that describe the purpose of the language, we need to ignore those         // that describe the purpose of the language, we need to ignore those
Line 168 
Line 169 
         return value;         return value;
 } }
  
 String LanguageParser::getLanguage(String & language_tag){  String LanguageParser::getLanguage(const String & language_tag){
         // given a language_tag: en-US-mn we want to return "en"         // given a language_tag: en-US-mn we want to return "en"
         Uint32 i;         Uint32 i;
         if((i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND)         if((i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND)
Line 176 
Line 177 
         return String(language_tag);         return String(language_tag);
 } }
  
 String LanguageParser::getCountry(String & language_tag){  String LanguageParser::getCountry(const String & language_tag){
         // given a language_tag: en-US-mn we want to return "US"         // given a language_tag: en-US-mn we want to return "US"
         Uint32 i,j;         Uint32 i,j;
         if( (i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND )         if( (i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND )
Line 187 
Line 188 
         return String::EMPTY;         return String::EMPTY;
 } }
  
 String LanguageParser::getVariant(String & language_tag){  String LanguageParser::getVariant(const String & language_tag){
         // given a language_tag: en-US-mn we want to return "mn"         // given a language_tag: en-US-mn we want to return "mn"
         Uint32 i;         Uint32 i;
         if( (i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND )         if( (i = language_tag.find(findSeparator(language_tag.getCString()))) != PEG_NOT_FOUND )
Line 209 
Line 210 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
 } }
  
 Boolean LanguageParser::isValid(String language_tag, Boolean validate_length){  Boolean LanguageParser::isValid(const String& language_tag, Boolean validate_length){
         //break the String down into parts(subtags), then validate each part         //break the String down into parts(subtags), then validate each part
  
         if(language_tag == "*") return true;         if(language_tag == "*") return true;
Line 229 
Line 230 
         return true;         return true;
 } }
  
 String LanguageParser::convertPrivateLanguageTag(String language_tag){  String LanguageParser::convertPrivateLanguageTag(const String & language_tag){
         // figure out if its a unix style locale or windows locale         // figure out if its a unix style locale or windows locale
         Uint32 i;         Uint32 i;
         if(( i = language_tag.find("pegasus-")) != PEG_NOT_FOUND ){         if(( i = language_tag.find("pegasus-")) != PEG_NOT_FOUND ){
                 language_tag = language_tag.subString(i+5);  // capture the remainder of the string                  String str;
                 return String(replaceSeparator(language_tag.getCString(), '-'));                  str = language_tag.subString(i+5);
                   //language_tag = language_tag.subString(i+5);  // capture the remainder of the string
                   return String(replaceSeparator(str.getCString(), '-'));
         }         }
         //else if( (i = language_tag.find("win-")) != PEG_NOT_FOUND ){         //else if( (i = language_tag.find("win-")) != PEG_NOT_FOUND ){
           // return language_tag.subString(i+4);  // capture the remainder of the string           // return language_tag.subString(i+4);  // capture the remainder of the string
Line 245 
Line 248 
         }         }
 } }
  
 Boolean LanguageParser::checkAlpha(CString _str){  Boolean LanguageParser::checkAlpha(const CString & _str){
         Uint32 length = (Uint32) strlen(_str);         Uint32 length = (Uint32) strlen(_str);
         for(Uint32 i = 0; i < length; i++)         for(Uint32 i = 0; i < length; i++)
                 if( !isalpha(_str[i]) )                 if( !isalpha(_str[i]) )
Line 253 
Line 256 
         return true;         return true;
 } }
  
 char LanguageParser::findSeparator(CString _str){  char LanguageParser::findSeparator(const CString & _str){
         Uint32 length = (Uint32) strlen(_str);         Uint32 length = (Uint32) strlen(_str);
         for(Uint32 i = 0; i < length; i++)         for(Uint32 i = 0; i < length; i++)
                 if(!isalnum(_str[i]))                 if(!isalnum(_str[i]))
Line 261 
Line 264 
         return '\0';         return '\0';
 } }
  
 CString LanguageParser::replaceSeparator(CString _s, char new_sep){  CString LanguageParser::replaceSeparator(const CString & _s, char new_sep){
         char * _str = const_cast<char *>((const char*)_s);      const Uint32 length = (Uint32) strlen(_s);
         Uint32 length = (Uint32) strlen(_str);      AutoArrayPtr<char> _str(new char[length + 1]);
       strcpy(_str.get(),_s);
         for(Uint32 i = 0; i < length; i++)         for(Uint32 i = 0; i < length; i++)
                 _str[i] = (!isalnum(_str[i])) ? new_sep : _str[i];      {
         return (String(_str)).getCString();          if (!isalnum(_str.get()[i]))
           {
               _str.get()[i] = new_sep;
           }
       }
           const String retval(_str.get());
       _str.release();
       return(retval.getCString());
 } }
  
  

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