peiyongz 2002/11/05 08:54:46
Modified: c/src/xercesc/util/MsgLoaders/MsgCatalog
MsgCatalogLoader.hpp MsgCatalogLoader.cpp
Log:
Using XERCESC_NLS_HOME
Revision Changes Path
1.4 +5 -3
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
Index: MsgCatalogLoader.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MsgCatalogLoader.hpp 4 Nov 2002 15:10:41 -0000 1.3
+++ MsgCatalogLoader.hpp 5 Nov 2002 16:54:46 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/05 16:54:46 peiyongz
+ * Using XERCESC_NLS_HOME
+ *
* Revision 1.3 2002/11/04 15:10:41 tng
* C++ Namespace Support.
*
@@ -153,11 +156,10 @@
// This is our DLL module handle that we need in order to load
// resource messages. This is set during construction.
//
- // fMsgDomain
- // This is the name of the error domain that this loader is for.
+ // fMsgSet
+ // This is the message set id for the error domain that this loader is for.
// -----------------------------------------------------------------------
nl_catd fCatalogHandle;
- XMLCh* fMsgDomain;
unsigned int fMsgSet;
};
1.6 +17 -10
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsgCatalogLoader.cpp 4 Nov 2002 15:10:41 -0000 1.5
+++ MsgCatalogLoader.cpp 5 Nov 2002 16:54:46 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/05 16:54:46 peiyongz
+ * Using XERCESC_NLS_HOME
+ *
* Revision 1.5 2002/11/04 15:10:41 tng
* C++ Namespace Support.
*
@@ -124,7 +127,6 @@
// ---------------------------------------------------------------------------
MsgCatalogLoader::MsgCatalogLoader(const XMLCh* const msgDomain)
:fCatalogHandle(0)
-,fMsgDomain(0)
,fMsgSet(0)
{
if (!XMLString::equals(msgDomain, XMLUni::fgXMLErrDomain)
@@ -136,10 +138,18 @@
// Try to get the module handle
char* tempLoc = setlocale(LC_ALL, "");
- char catfile[256];
+ char catfile[1024];
+
+ memset(catfile, 0, sizeof catfile);
+ char *nlsHome = getenv("XERCESC_NLS_HOME");
+
+ if (nlsHome)
+ {
+ strcpy(catfile, nlsHome);
+ strcat(catfile, "/msg/");
+ }
- strcpy(catfile, getenv("XERCESCROOT"));
- strcat(catfile, "/lib/msg/XMLMessages.cat");
+ strcat(catfile, "XMLMessages.cat");
fCatalogHandle = catopen(catfile , 0);
if ((int)fCatalogHandle == -1)
@@ -150,20 +160,17 @@
exit(1);
}
- fMsgDomain = XMLString::replicate(msgDomain);
-
- if (XMLString::equals(fMsgDomain, XMLUni::fgXMLErrDomain))
+ if (XMLString::equals(msgDomain, XMLUni::fgXMLErrDomain))
fMsgSet = CatId_XMLErrs;
- else if (XMLString::equals(fMsgDomain, XMLUni::fgExceptDomain))
+ else if (XMLString::equals(msgDomain, XMLUni::fgExceptDomain))
fMsgSet = CatId_XMLExcepts;
- else if (XMLString::equals(fMsgDomain, XMLUni::fgValidityDomain))
+ else if (XMLString::equals(msgDomain, XMLUni::fgValidityDomain))
fMsgSet = CatId_XMLValid;
}
MsgCatalogLoader::~MsgCatalogLoader()
{
catclose(fCatalogHandle);
- delete [] fMsgDomain;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
