cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog MsgCatalogLoader.cpp

[peiyongz]

peiyongz    2003/02/20 12:20:11

  Modified:    c/src/xercesc/util/MsgLoaders/MsgCatalog
                        MsgCatalogLoader.cpp
  Log:
  Allow set user specified error message file location in PlatformUtils::Initialize().
  
  Revision  Changes    Path
  1.12      +25 -12    
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
  
  Index: MsgCatalogLoader.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MsgCatalogLoader.cpp      12 Dec 2002 16:46:18 -0000      1.11
  +++ MsgCatalogLoader.cpp      20 Feb 2003 20:20:11 -0000      1.12
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.12  2003/02/20 20:20:11  peiyongz
  + * Allow set user specified error message file location in 
PlatformUtils::Initialize().
  + *
    * Revision 1.11  2002/12/12 16:46:18  peiyongz
    * MsgCatalog file name changed.
    *
  @@ -154,35 +157,45 @@
       }
   
       // Prepare the path info
  -    char catpath[1024];
  -    memset(catpath, 0, sizeof catpath);
  -    char *nlsHome = getenv("XERCESC_NLS_HOME");
  +    char locationBuf[1024];
  +    memset(locationBuf, 0, sizeof locationBuf);
  +    const char *nlsHome = XMLMsgLoader::getNLSHome();
  +    
       if (nlsHome)
       {
  -        strcpy(catpath, nlsHome);
  -        strcat(catpath, "/");
  +     strcpy(locationBuf, nlsHome);
  +        strcat(locationBuf, "/");
       }
       else
       {
  -        char *altHome = getenv("XERCESCROOT");
  -        if (altHome)
  +        nlsHome = getenv("XERCESC_NLS_HOME");
  +        if (nlsHome)
           {
  -            strcpy(catpath, altHome);
  -            strcat(catpath, "/msg/");
  +            strcpy(locationBuf, nlsHome);
  +            strcat(locationBuf, "/");
           }
  +        else
  +        {
  +            nlsHome = getenv("XERCESCROOT");
  +            if (nlsHome)
  +            {                        
  +                strcpy(locationBuf, nlsHome);
  +                strcat(locationBuf, "/msg/");
  +            }
  +        }    
       }
  -
  +    
       // Prepare user-specified locale specific cat file
       char catuser[1024];
       memset(catuser, 0, sizeof catuser);
  -    strcpy(catuser, catpath);
  +    strcpy(catuser, locationBuf);
       strcat(catuser, "XercesMessages_");
       strcat(catuser, XMLMsgLoader::getLocale());
       strcat(catuser, ".cat");
           
       char catdefault[1024];
       memset(catdefault, 0, sizeof catdefault);
  -    strcpy(catdefault, catpath);
  +    strcpy(catdefault, locationBuf);
       strcat(catdefault, "XercesMessages_en_US.cat");
   
      /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]