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

Diff for /pegasus/src/Pegasus/Common/CIMStatusCode.cpp between version 1.9 and 1.13

version 1.9, 2004/08/24 23:10:21 version 1.13, 2005/12/19 21:51:37
Line 1 
Line 1 
 //%2003////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // 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.
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // 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 copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 27 
Line 31 
 // //
 // Modified By: Carol Ann Krug Graves, Hewlett-Packard Company // Modified By: Carol Ann Krug Graves, Hewlett-Packard Company
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 77 
Line 82 
  
     "CIM_ERR_METHOD_NOT_AVAILABLE: The extrinsic method could not be executed",     "CIM_ERR_METHOD_NOT_AVAILABLE: The extrinsic method could not be executed",
  
     "CIM_ERR_METHOD_NOT_FOUND: The specified extrinsic method does not exist",      "CIM_ERR_METHOD_NOT_FOUND: The specified extrinsic method does not exist"
   
     // NOTE - the message below must always be last  
     "The CIM status code associated with this error is not recognized"  
 }; };
  
 // l10n - keys for cimstatus messages // l10n - keys for cimstatus messages
Line 120 
Line 122 
  
     "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_AVAILABLE",     "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_AVAILABLE",
  
     "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_FOUND",      "Common.CIMStatusCode.CIM_ERR_METHOD_NOT_FOUND"
   
     // NOTE: the message key below must always be last  
     "Common.CIMStatusCode.UNRECOGNIZED_STATUS_CODE",  
 }; };
  
 // l10n TOD0 - the first func should go away when all Pegasus is globalized  // l10n TODO - the first func should go away when all Pegasus is globalized
  
 const char* cimStatusCodeToString(CIMStatusCode code) const char* cimStatusCodeToString(CIMStatusCode code)
 { {
     if (Uint32(code) <= CIM_ERR_METHOD_NOT_FOUND)      if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
         return _cimMessages[Uint32(code)];         return _cimMessages[Uint32(code)];
  
     return "Unrecognized CIM status code";     return "Unrecognized CIM status code";
Line 140 
Line 139 
 String cimStatusCodeToString(CIMStatusCode code, String cimStatusCodeToString(CIMStatusCode code,
                              const ContentLanguages& contentLanguages)                              const ContentLanguages& contentLanguages)
 { {
   AcceptLanguages acceptLanguages;      MessageLoaderParms parms;
   
   Uint32 tempCode;  
  
   if (Uint32(code) <= CIM_ERR_METHOD_NOT_FOUND)      if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
   {   {
     tempCode = (Uint32)code;          parms = MessageLoaderParms(
               _cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);
   }   }
   else   else
   {   {
     tempCode = CIM_ERR_METHOD_NOT_FOUND + 1;          parms = MessageLoaderParms(
               "Common.CIMStatusCode.UNRECOGNIZED_STATUS_CODE",
               "Unrecognized CIM status code \"$0\"", Uint32(code));
   }   }
  
   MessageLoaderParms parms(_cimMessageKeys[tempCode], _cimMessages[tempCode]);      if (contentLanguages.size() > 0)
   if (contentLanguages.size() == 0) //use AcceptLanguages::EMPTY  
   {  
     return MessageLoader::getMessage(parms);  
   }  
   else  
   {   {
     //build AcceptLanguages from contentLanguages, use in getMessage     //build AcceptLanguages from contentLanguages, use in getMessage
     parms.acceptlanguages = AcceptLanguages(contentLanguages.getLanguageElement(0).getTag());          parms.acceptlanguages.clear();
     return MessageLoader::getMessage(parms);          parms.acceptlanguages.insert(contentLanguages.getLanguageTag(0), 1.0);
   }   }
   
       return MessageLoader::getMessage(parms);
 } }
  
 // l10n // l10n
 ContentLanguages cimStatusCodeToString_Thread(String & message, CIMStatusCode code) ContentLanguages cimStatusCodeToString_Thread(String & message, CIMStatusCode code)
 { {
   Uint32 tempCode;      MessageLoaderParms parms;
  
   if (Uint32(code) <= CIM_ERR_METHOD_NOT_FOUND)      if (Uint32(code) < (sizeof(_cimMessageKeys)/sizeof(_cimMessageKeys[0])))
   {   {
     tempCode = (Uint32)code;          parms = MessageLoaderParms(
               _cimMessageKeys[Uint32(code)], _cimMessages[Uint32(code)]);
   }   }
   else   else
   {   {
     tempCode = CIM_ERR_METHOD_NOT_FOUND + 1;          parms = MessageLoaderParms(
               "Common.CIMStatusCode.UNRECOGNIZED_STATUS_CODE",
               "Unrecognized CIM status code \"$0\"", Uint32(code));
   }   }
  
   MessageLoaderParms parms(_cimMessageKeys[tempCode], _cimMessages[tempCode]);  
   //parms.useThreadLocale = true;   //parms.useThreadLocale = true;
   message = MessageLoader::getMessage(parms);   message = MessageLoader::getMessage(parms);
   return parms.contentlanguages;   return parms.contentlanguages;


Legend:
Removed from v.1.9  
changed lines
  Added in v.1.13

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2