dbertoni 2003/12/31 11:11:22
Modified: c/src/xalanc/ICUBridge FunctionICUFormatNumber.cpp
c/src/xalanc/NLS/en_US XalanMsg_en_US.xlf
c/src/xalanc/PlatformSupport DirectoryEnumerator.hpp
c/src/xalanc/XPath FunctionString.cpp XPath.cpp
XPathProcessorImpl.cpp XalanQName.cpp
c/src/xalanc/XSLT AVT.cpp Constants.cpp Constants.hpp
ElemAttribute.cpp ElemAttributeSet.cpp
ElemElement.cpp ElemForEach.cpp ElemMessage.cpp
ElemTemplateElement.cpp KeyTable.cpp Stylesheet.cpp
StylesheetHandler.cpp TraceListenerDefault.cpp
XSLTEngineImpl.cpp
c/src/xalanc/XalanEXSLT XalanEXSLTCommon.cpp
XalanEXSLTMath.cpp
c/src/xalanc/XercesParserLiaison XercesParserLiaison.cpp
Log:
Patch for Bugzilla 25843.
Revision Changes Path
1.3 +2 -3
xml-xalan/c/src/xalanc/ICUBridge/FunctionICUFormatNumber.cpp
Index: FunctionICUFormatNumber.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/ICUBridge/FunctionICUFormatNumber.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionICUFormatNumber.cpp 19 Sep 2003 21:05:20 -0000 1.2
+++ FunctionICUFormatNumber.cpp 31 Dec 2003 19:11:21 -0000 1.3
@@ -141,9 +141,8 @@
if (theResultCode != 0)
{
executionContext.warn(
- XALAN_STATIC_UCODE_STRING("ICUBridge::FormatNumber
failed (") +
- UnsignedLongToDOMString(theResultCode) +
- XALAN_STATIC_UCODE_STRING(")"),
+
XalanMessageLoader::getMessage(XalanMessages::FormatNumberFailed_1Param,
+ UnsignedLongToDOMString(theResultCode)),
context,
locator);
1.2 +79 -0 xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
Index: XalanMsg_en_US.xlf
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanMsg_en_US.xlf 2 Dec 2003 19:58:51 -0000 1.1
+++ XalanMsg_en_US.xlf 31 Dec 2003 19:11:21 -0000 1.2
@@ -341,6 +341,16 @@
<target>The attribute name '{0}' is not a valid QName</target>
</trans-unit>
+<trans-unit id="IsNotValidQName_1Param">
+ <source>'{0}' is not a valid QName</source>
+ <target>'{0}' is not a valid QName</target>
+</trans-unit>
+
+<trans-unit id="IsNotValidNCName_1Param">
+ <source>'{0}' is not a valid NCName</source>
+ <target>'{0}' is not a valid NCName</target>
+</trans-unit>
+
<trans-unit id="AttributeValueNotValidQName_2Param">
<source>The attribute '{0}' has a value '{1}' which is not a
valid QName</source>
<target>The attribute '{0}' has a value '{1}' which is not a
valid QName</target>
@@ -695,11 +705,51 @@
<target>Line {0}, Column {0} ,</target>
</trans-unit>
+<trans-unit id="CommaAndBrackets_1Param">
+ <source>, ({0})</source>
+ <target>, ({0})</target>
+</trans-unit>
+
+<trans-unit id="CouldNotResolvePrefix">
+ <source>Warning: Could not resolve prefix</source>
+ <target>Warning: Could not resolve prefix</target>
+</trans-unit>
+
<trans-unit id="MatchIs_1Param">
<source> match="{0}" </source>
<target> match="{0}" </target>
</trans-unit>
+<trans-unit id="Warning2">
+ <source>Warning </source>
+ <target>Warning </target>
+</trans-unit>
+
+<trans-unit id="AtFileLineColumn_3Param">
+ <source> at (file {0} , line {1} , column {2} ): </source>
+ <target> at (file {0} , line {1} , column {2} ): </target>
+</trans-unit>
+
+<trans-unit id="FatalError">
+ <source>Fatal Error</source>
+ <target>Fatal Error</target>
+</trans-unit>
+
+<trans-unit id="FormatNumberFailed_1Param">
+ <source>ICUBridge::FormatNumber failed ({0})</source>
+ <target>ICUBridge::FormatNumber failed ({0})</target>
+</trans-unit>
+
+<trans-unit id="UnknownMatchOperation">
+ <source>unknown match operation!</source>
+ <target>unknown match operation!</target>
+</trans-unit>
+
+<trans-unit id="AtUnknownFileLineColumn_2Param">
+ <source> at (unknown file , line {1} , column {2} ): </source>
+ <target> at (unknown file , line {1} , column {2} ): </target>
+</trans-unit>
+
<trans-unit id="EmptyNodeList">
<source>[empty node list]</source>
<target>[empty node list]</target>
@@ -710,6 +760,11 @@
<target>(default {0} rule)</target>
</trans-unit>
+<trans-unit id="DefaultRootRule">
+ <source>(default root rule)</source>
+ <target>(default root rule)</target>
+</trans-unit>
+
<trans-unit id="Equal_3Param">
<source>{0}, {1}="{2}"</source>
<target>{0}, {1}="{2}"</target>
@@ -993,6 +1048,11 @@
<target>Error opening file: </target>
</trans-unit>
+<trans-unit id="Error2">
+ <source>Error </source>
+ <target>Error </target>
+</trans-unit>
+
<trans-unit id="ErrorWritingToStdStream">
<source>Error writing to standard stream</source>
<target>Error writing to standard stream</target>
@@ -1023,6 +1083,25 @@
<target>Input XML</target>
</trans-unit>
+<trans-unit id="XslSortMustBeAscendOrDescend">
+ <source>xsl:sort order must be 'ascending' or
'descending'</source>
+ <target>xsl:sort order must be 'ascending' or
'descending'</target>
+</trans-unit>
+
+<trans-unit id="XslSortDataTypeMustBe">
+ <source>xsl:sort data-type must be 'text', 'number' or a
prefixed name</source>
+ <target>xsl:sort data-type must be 'text', 'number' or a
prefixed name</target>
+</trans-unit>
+
+<trans-unit id="XslSortHasUnlnownDataType">
+ <source>xsl:sort has an unknown data-type. The data-type will
be 'text'</source>
+ <target>xsl:sort has an unknown data-type. The data-type will
be 'text'</target>
+</trans-unit>
+
+<trans-unit id="XslSortCaseOrderMustBe">
+ <source>xsl:sort case-order must be 'upper-first' or
'lower-first'</source>
+ <target>xsl:sort case-order must be 'upper-first' or
'lower-first'</target>
+</trans-unit>
</body>
</file>
</xliff>
1.4 +31 -29
xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
Index: DirectoryEnumerator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectoryEnumerator.hpp 3 Dec 2003 21:52:57 -0000 1.3
+++ DirectoryEnumerator.hpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -72,6 +72,7 @@
+#include <cstring>
#include <functional>
#include <iterator>
@@ -155,7 +156,7 @@
}
};
-#else
+#elif defined(XALAN_POSIX2_AVAILABLE)
struct FindFileStruct : public dirent
{
@@ -176,33 +177,37 @@
*
* @return true if file is a directory
*/
- bool isDirectory() const
+ bool isDirectory(const char* theParentPath) const
{
-#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) ||
defined(OS400) || defined(TRU64)
- return false;
-#else
- if (d_type == DT_DIR || d_type == DT_UNKNOWN)
- {
- return true;
- }
- else
+ bool fIsDir = false;
+
+ char theBuffer[5000];
+
+ getcwd(theBuffer, sizeof(theBuffer) / sizeof(theBuffer[0]) - 1);
+
+ strcat(theBuffer, "/");
+ strcat(theBuffer, getName());
+
+ if (chdir(theBuffer) == 0)
{
- return false;
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::strrchr;
+#endif
+
+ *strrchr(theBuffer, '/') = '\0';
+
+ chdir(theBuffer);
+
+ fIsDir = true;
}
-#endif
+
+ return fIsDir;
}
bool
isSelfOrParent() const
{
-#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) ||
defined(OS400) || defined(TRU64)
- return false;
-#else
- if (isDirectory() == false)
- {
- return false;
- }
- else if (d_name[0] == '.')
+ if (d_name[0] == '.')
{
if (d_name[1] == '\0')
{
@@ -218,14 +223,13 @@
return false;
}
}
- else
- {
- return false;
- }
-#endif
+
+ return false;
}
};
+#else
+ #error Unsupported platform!
#endif
@@ -257,7 +261,6 @@
DirectoryFilterPredicate theDirectoryPredicate;
return !theDirectoryPredicate(theFindData);
-
}
};
@@ -311,7 +314,7 @@
}
-#elif defined(LINUX)
+#elif defined(XALAN_POSIX2_AVAILABLE)
CharVectorType theTargetVector;
@@ -367,8 +370,7 @@
}
}
#else
- // Do nothing for now...
- // Unsupported platform!!!
+ #error Unsupported platform!
#endif
}
1.4 +1 -1 xml-xalan/c/src/xalanc/XPath/FunctionString.cpp
Index: FunctionString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/FunctionString.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionString.cpp 2 Dec 2003 19:58:53 -0000 1.3
+++ FunctionString.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -95,7 +95,7 @@
if (context == 0)
{
executionContext.error(
-
XalanMessageLoader::getMessage(XalanMessages::FunctionRequiresNonNullContextNode_1Param,
"string()"),
+
XalanMessageLoader::getMessage(XalanMessages::FunctionRequiresNonNullContextNode_1Param,
"string"),
context,
locator);
1.8 +11 -7 xml-xalan/c/src/xalanc/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPath.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPath.cpp 2 Dec 2003 19:58:53 -0000 1.7
+++ XPath.cpp 31 Dec 2003 19:11:21 -0000 1.8
@@ -123,12 +123,12 @@
XPathExecutionContext& executionContext,
int opPos)
const
{
- XalanDOMString theMessage("Unknown op code: ");
+ XalanDOMString theOpCode;
- LongToDOMString(m_expression.getOpCodeMapValue(opPos), theMessage);
+ LongToDOMString(m_expression.getOpCodeMapValue(opPos), theOpCode);
executionContext.error(
- theMessage,
+
XalanMessageLoader::getMessage(XalanMessages::UnknownOpCode_1Param,theOpCode),
context,
m_locator);
}
@@ -141,7 +141,7 @@
XPathExecutionContext& executionContext) const
{
executionContext.error(
- "The expression does not evaluate to a node-set",
+
XalanMessageLoader::getMessage(XalanMessages::ExpressionDoesNotEvaluateToNodeSet),
context,
m_locator);
}
@@ -3237,7 +3237,9 @@
break;
default:
- executionContext.error(TranscodeFromLocalCodePage("unknown
match operation!"), context, getLocator());
+ executionContext.error(
+
XalanMessageLoader::getMessage(XalanMessages::UnknownMatchOperation)
+ , context, getLocator());
break;
}
@@ -4452,7 +4454,8 @@
}
else
{
-
executionContext.error(TranscodeFromLocalCodePage("Arg length of
processing-instruction() node test is incorrect!"), context, getLocator());
+
+
executionContext.error(XalanMessageLoader::getMessage(XalanMessages::ArgLengthNodeTestIsIncorrect_1Param,
"processing-instruction()"), context, getLocator());
}
}
@@ -4823,7 +4826,8 @@
}
else
{
- executionContext.error(TranscodeFromLocalCodePage("Arg
length of processing-instruction() node test is incorrect!"), 0,
xpath.getLocator());
+
+
executionContext.error(XalanMessageLoader::getMessage(XalanMessages::ArgLengthNodeTestIsIncorrect_1Param,
"processing-instruction()"), 0, xpath.getLocator());
}
break;
1.4 +4 -2 xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.cpp
Index: XPathProcessorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathProcessorImpl.cpp 2 Dec 2003 19:58:53 -0000 1.3
+++ XPathProcessorImpl.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -531,7 +531,9 @@
if (XalanQName::isValidNCName(scratchString) == false)
{
- error(XalanDOMString("'") + scratchString + XalanDOMString("'
is not a valid NCName"));
+
+
error(XalanMessageLoader::getMessage(XalanMessages::IsNotValidNCName_1Param,scratchString));
+
}
const XalanDOMString* const uName =
@@ -1714,7 +1716,7 @@
if (argCount != 0)
{
- error("The true() function does not accept any arguments");
+
error(XalanMessageLoader::getMessage(XalanMessages::FunctionDoesNotAcceptAnyArguments_1Param,"true()"));
}
}
1.3 +3 -3 xml-xalan/c/src/xalanc/XPath/XalanQName.cpp
Index: XalanQName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQName.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanQName.cpp 22 Aug 2003 00:47:48 -0000 1.2
+++ XalanQName.cpp 31 Dec 2003 19:11:21 -0000 1.3
@@ -64,6 +64,7 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
#include <xalanc/PlatformSupport/XalanUnicode.hpp>
@@ -400,12 +401,11 @@
const XalanDOMChar* theQName,
XalanDOMString::size_type theQNameLength)
{
- XalanDOMString theResult("'");
+ XalanDOMString theResult;
theResult.append(theQName, theQNameLength);
- theResult += XalanDOMString("' is not a valid QName");
- return theResult;
+ return
XalanMessageLoader::getMessage(XalanMessages::IsNotValidQName_1Param,
theResult);
}
1.4 +1 -2 xml-xalan/c/src/xalanc/XSLT/AVT.cpp
Index: AVT.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/AVT.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AVT.cpp 2 Dec 2003 19:58:54 -0000 1.3
+++ AVT.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -371,8 +371,7 @@
{
if (tokenizer.hasMoreTokens() == false)
{
-
constructionContext.error(XalanMessageLoader::getMessage(XalanMessages::AttributeValueTemplateHasMissing),0,
- locator);
+
constructionContext.error(XalanMessageLoader::getMessage(XalanMessages::AttributeValueTemplateHasMissing),0,locator);
}
else
{
1.4 +16 -0 xml-xalan/c/src/xalanc/XSLT/Constants.cpp
Index: Constants.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/Constants.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.cpp 2 Dec 2003 19:58:54 -0000 1.3
+++ Constants.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -171,13 +171,17 @@
static XalanDOMString ELEMNAME_FOREACH_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_HTML_STRING;
static XalanDOMString ELEMNAME_IF_WITH_PREFIX_STRING;
+static XalanDOMString ELEMNAME_IMPORT_WITH_PREFIX_STRING;
+static XalanDOMString ELEMNAME_INCLUDE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_KEY_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_NUMBER_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_PARAM_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_PI_WITH_PREFIX_STRING;
+static XalanDOMString
ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_SORT_WITH_PREFIX_STRING;
+static XalanDOMString ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_TEXT_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
@@ -297,13 +301,17 @@
const XalanDOMString&
Constants::ELEMNAME_FOREACH_WITH_PREFIX_STRING =
::ELEMNAME_FOREACH_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_HTML_STRING =
::ELEMNAME_HTML_STRING;
const XalanDOMString&
Constants::ELEMNAME_IF_WITH_PREFIX_STRING = ::ELEMNAME_IF_WITH_PREFIX_STRING;
+const XalanDOMString&
Constants::ELEMNAME_IMPORT_WITH_PREFIX_STRING =
::ELEMNAME_IMPORT_WITH_PREFIX_STRING;
+const XalanDOMString&
Constants::ELEMNAME_INCLUDE_WITH_PREFIX_STRING =
::ELEMNAME_INCLUDE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_KEY_WITH_PREFIX_STRING = ::ELEMNAME_KEY_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_MESSAGE_WITH_PREFIX_STRING =
::ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_NUMBER_WITH_PREFIX_STRING =
::ELEMNAME_NUMBER_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING =
::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_PARAM_WITH_PREFIX_STRING =
::ELEMNAME_PARAM_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_PI_WITH_PREFIX_STRING = ::ELEMNAME_PI_WITH_PREFIX_STRING;
+const XalanDOMString&
Constants::ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING =
::ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_SORT_WITH_PREFIX_STRING =
::ELEMNAME_SORT_WITH_PREFIX_STRING;
+const XalanDOMString&
Constants::ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING =
::ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING =
::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_TEXT_WITH_PREFIX_STRING =
::ELEMNAME_TEXT_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING =
::ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
@@ -423,13 +431,17 @@
::ELEMNAME_FOREACH_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:for-each");
::ELEMNAME_HTML_STRING = XALAN_STATIC_UCODE_STRING("HTML");
::ELEMNAME_IF_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:if");
+ ::ELEMNAME_IMPORT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:import");
+ ::ELEMNAME_INCLUDE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:include");
::ELEMNAME_KEY_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:key");
::ELEMNAME_MESSAGE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:message");
::ELEMNAME_NUMBER_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:number");
::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:otherwise");
::ELEMNAME_PARAM_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:param");
::ELEMNAME_PI_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:processing-instruction");
+ ::ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:preserve-space");
::ELEMNAME_SORT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:sort");
+ ::ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:strip-space");
::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:template");
::ELEMNAME_TEXT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:text");
::ELEMNAME_VALUEOF_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:value-of");
@@ -550,13 +562,17 @@
releaseMemory(::ELEMNAME_FOREACH_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_HTML_STRING);
releaseMemory(::ELEMNAME_IF_WITH_PREFIX_STRING);
+ releaseMemory(::ELEMNAME_IMPORT_WITH_PREFIX_STRING);
+ releaseMemory(::ELEMNAME_INCLUDE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_KEY_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_MESSAGE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_NUMBER_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_PARAM_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_PI_WITH_PREFIX_STRING);
+ releaseMemory(::ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_SORT_WITH_PREFIX_STRING);
+ releaseMemory(::ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_TEXT_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_VALUEOF_WITH_PREFIX_STRING);
1.4 +6 -2 xml-xalan/c/src/xalanc/XSLT/Constants.hpp
Index: Constants.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/Constants.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.hpp 2 Dec 2003 19:58:54 -0000 1.3
+++ Constants.hpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -115,18 +115,22 @@
static const XalanDOMString& ELEMNAME_FOREACH_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_HTML_STRING;
static const XalanDOMString& ELEMNAME_IF_WITH_PREFIX_STRING;
+ static const XalanDOMString& ELEMNAME_IMPORT_WITH_PREFIX_STRING;
+ static const XalanDOMString& ELEMNAME_INCLUDE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_KEY_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_NUMBER_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_SORT_WITH_PREFIX_STRING;
+ static const XalanDOMString& ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_TEXT_WITH_PREFIX_STRING;
+ static const XalanDOMString& ELEMNAME_PARAM_WITH_PREFIX_STRING;
+ static const XalanDOMString&
ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING;
+ static const XalanDOMString& ELEMNAME_PI_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_VARIABLE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_WHEN_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_PARAM_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_PI_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
/*---------------------------------------------
1.4 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttribute.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemAttribute.cpp 2 Dec 2003 19:58:54 -0000 1.3
+++ ElemAttribute.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -354,7 +354,7 @@
{
// Could not resolve prefix
executionContext.warn(
- "Warning: Could not
resolve prefix",
+
XalanMessageLoader::getMessage(XalanMessages::CouldNotResolvePrefix),
executionContext.getCurrentNode(),
getLocator());
}
1.5 +5 -3 xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemAttributeSet.cpp 2 Dec 2003 19:58:54 -0000 1.4
+++ ElemAttributeSet.cpp 31 Dec 2003 19:11:21 -0000 1.5
@@ -130,9 +130,11 @@
else if (m_qname->isValid() == false)
{
constructionContext.error(
-
XalanMessageLoader::getMessage(XalanMessages::TemplateHasIllegalAttribute_2Param,"xsl:attribute-set","name"),
- 0,
- this);
+
XalanMessageLoader::getMessage(XalanMessages::TemplateHasIllegalAttribute_2Param
+
,Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING
+ ,Constants::ATTRNAME_NAME),
+ 0,
+ this);
}
}
1.6 +3 -1 xml-xalan/c/src/xalanc/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemElement.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemElement.cpp 2 Dec 2003 19:58:54 -0000 1.5
+++ ElemElement.cpp 31 Dec 2003 19:11:21 -0000 1.6
@@ -133,7 +133,9 @@
if(0 == m_nameAVT)
{
constructionContext.error(
-
XalanMessageLoader::getMessage(XalanMessages::TemplateMustHaveAttribute_2Param,"xsl:element","name"),
+
XalanMessageLoader::getMessage(XalanMessages::TemplateMustHaveAttribute_2Param
+ ,Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING
+ ,Constants::ATTRNAME_NAME),
0,
this);
}
1.7 +4 -4 xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemForEach.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemForEach.cpp 2 Dec 2003 19:58:54 -0000 1.6
+++ ElemForEach.cpp 31 Dec 2003 19:11:21 -0000 1.7
@@ -312,14 +312,14 @@
if (theQName.getNamespace().length() ==
0)
{
executionContext.error(
- "xsl:sort data-type
must be 'text', 'number' or a prefixed name",
+
XalanMessageLoader::getMessage(XalanMessages::XslSortDataTypeMustBe),
executionContext.getCurrentNode(),
sort->getLocator());
}
else
{
executionContext.warn(
- "xsl:sort has an
unknown data-type. The data-type will be 'text'",
+
XalanMessageLoader::getMessage(XalanMessages::XslSortHasUnlnownDataType),
executionContext.getCurrentNode(),
sort->getLocator());
}
@@ -346,7 +346,7 @@
else if (equals(scratchString,
Constants::ATTRVAL_ORDER_ASCENDING) == false)
{
executionContext.error(
- "xsl:sort order must be
'ascending' or 'descending'",
+
XalanMessageLoader::getMessage(XalanMessages::XslSortMustBeAscendOrDescend),
executionContext.getCurrentNode(),
sort->getLocator());
}
@@ -376,7 +376,7 @@
else
{
executionContext.error(
- "xsl:sort case-order must be
'upper-first' or 'lower-first'",
+
XalanMessageLoader::getMessage(XalanMessages::XslSortCaseOrderMustBe),
executionContext.getCurrentNode(),
sort->getLocator());
}
1.4 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemMessage.cpp 2 Dec 2003 19:58:54 -0000 1.3
+++ ElemMessage.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -107,7 +107,7 @@
else if (equals(avalue, Constants::ATTRVAL_NO) == false)
{
constructionContext.error(
-
XalanMessageLoader::getMessage(XalanMessages::AttributeHasIllegalValue_1Param,"terminate"),
+
XalanMessageLoader::getMessage(XalanMessages::AttributeHasIllegalValue_1Param,Constants::ATTRNAME_TERMINATE),
0,
this);
}
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemTemplateElement.cpp 2 Dec 2003 19:58:54 -0000 1.6
+++ ElemTemplateElement.cpp 31 Dec 2003 19:11:21 -0000 1.7
@@ -351,7 +351,7 @@
const LocatorType* locator)
{
constructionContext.error(
-
XalanMessageLoader::getMessage(XalanMessages::TemplateIsNotAllowedAtThisPosition_1Param,"xsl:sort"),
+
XalanMessageLoader::getMessage(XalanMessages::TemplateIsNotAllowedAtThisPosition_1Param,Constants::ELEMNAME_SORT_WITH_PREFIX_STRING),
0,
locator);
}
1.4 +2 -2 xml-xalan/c/src/xalanc/XSLT/KeyTable.cpp
Index: KeyTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/KeyTable.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyTable.cpp 2 Dec 2003 19:58:54 -0000 1.3
+++ KeyTable.cpp 31 Dec 2003 19:11:21 -0000 1.4
@@ -146,10 +146,10 @@
assert(kd.getURI() != 0);
throw XSLTProcessorException(
-
XalanMessageLoader::getMessage(XalanMessages::UseOfFunctionIsIllegal_2Param,"key()","xsl:key"),
+
XalanMessageLoader::getMessage(XalanMessages::UseOfFunctionIsIllegal_2Param,"key()","xsl:key"),
*kd.getURI(),
kd.getLineNumber(),
- kd.getColumnNumber(),
+ kd.getColumnNumber(),
TranscodeFromLocalCodePage("XSLTKeyIllegalKeyFunctionException"));
}
else
1.7 +1 -1 xml-xalan/c/src/xalanc/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/Stylesheet.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Stylesheet.cpp 4 Dec 2003 21:47:45 -0000 1.6
+++ Stylesheet.cpp 31 Dec 2003 19:11:21 -0000 1.7
@@ -644,7 +644,7 @@
}
else
{
-
constructionContext.error(XalanMessageLoader::getMessage(XalanMessages::AttributeMustBe_2Params,"yes","no"));
+
constructionContext.error(XalanMessageLoader::getMessage(XalanMessages::AttributeMustBe_2Params,Constants::ATTRVAL_YES,Constants::ATTRVAL_NO));
return false;
}
}
1.8 +16 -12 xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StylesheetHandler.cpp 29 Dec 2003 01:25:52 -0000 1.7
+++ StylesheetHandler.cpp 31 Dec 2003 19:11:21 -0000 1.8
@@ -366,7 +366,7 @@
{
if (m_elemStack.empty() == true)
{
-
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,"xsl:sort"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,Constants::ELEMNAME_SORT_WITH_PREFIX_STRING),
locator);
}
ElemTemplateElement* const
theElement =
@@ -391,7 +391,7 @@
{
if (m_elemStack.empty() == true)
{
-
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,"xsl:apply-imports"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,Constants::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING),
locator);
}
ElemTemplateElement* const
theElement =
@@ -403,7 +403,7 @@
if (parentToken ==
StylesheetConstructionContext::ELEMNAME_FOR_EACH)
{
-
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,"xsl:apply-imports"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::IsNotAllowedInThisPosition_1Param,Constants::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING),
locator);
}
elem =
m_constructionContext.createElement(
@@ -435,7 +435,8 @@
if(StylesheetConstructionContext::ELEMNAME_CHOOSE != parent->getXSLToken())
{
-
error(XalanMessageLoader::getMessage(XalanMessages::NotParentedBy_2Param,"xsl:when","xsl:choose"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::NotParentedBy_2Param,
+
Constants::ELEMNAME_WHEN_WITH_PREFIX_STRING,Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING),
locator);
}
else
{
@@ -454,7 +455,7 @@
}
else
{
-
error(XalanMessageLoader::getMessage(XalanMessages::Misplaced_1Param,"xsl:when"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::Misplaced_1Param,Constants::ELEMNAME_WHEN_WITH_PREFIX_STRING),
locator);
}
}
}
@@ -466,7 +467,9 @@
if(StylesheetConstructionContext::ELEMNAME_CHOOSE != parent->getXSLToken())
{
-
error(XalanMessageLoader::getMessage(XalanMessages::NotParented_2Param,"xsl:otherwise","xsl:choose"),
locator);
+
error(XalanMessageLoader::getMessage(XalanMessages::NotParented_2Param
+
,Constants::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING
+
,Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING), locator);
}
else
{
@@ -1060,8 +1063,9 @@
error(
XalanMessageLoader::getMessage(
XalanMessages::ElementRequiresAttribute_2Param,
- isPreserveSpace == true ? "xsl:preserve-space"
: "xsl:strip-space",
- "elements"),
+ isPreserveSpace == true ?
+
Constants::ELEMNAME_PRESERVESPACE_WITH_PREFIX_STRING :
Constants::ELEMNAME_STRIPSPACE_WITH_PREFIX_STRING,
+ Constants::ATTRNAME_ELEMENTS),
locator);
}
}
@@ -1245,8 +1249,8 @@
error(
XalanMessageLoader::getMessage(
XalanMessages::ElementRequiresAttribute_2Param,
- "xsl:import",
- "href"),
+ Constants::ELEMNAME_IMPORT_WITH_PREFIX_STRING,
+ Constants::ATTRNAME_HREF),
locator);
}
}
@@ -1302,8 +1306,8 @@
error(
XalanMessageLoader::getMessage(
XalanMessages::ElementRequiresAttribute_2Param,
- "xsl:include",
- "href"),
+ Constants::ELEMNAME_INCLUDE_WITH_PREFIX_STRING,
+ Constants::ATTRNAME_HREF),
locator);
}
}
1.7 +8 -10 xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.cpp
Index: TraceListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraceListenerDefault.cpp 4 Dec 2003 21:47:46 -0000 1.6
+++ TraceListenerDefault.cpp 31 Dec 2003 19:11:21 -0000 1.7
@@ -244,11 +244,11 @@
if(parent ==
ete.getStylesheet().getStylesheetRoot().getDefaultRootRule())
{
-
m_printWriter.print(XalanMessageLoader::getMessage(XalanMessages::DefaultRootRule_1Param,"root"));
+
m_printWriter.print(XalanMessageLoader::getMessage(XalanMessages::DefaultRootRule));
}
else if(parent ==
ete.getStylesheet().getStylesheetRoot().getDefaultTextRule())
{
-
m_printWriter.print(XalanMessageLoader::getMessage(XalanMessages::DefaultRootRule_1Param,"text"));
+
m_printWriter.print(XalanMessageLoader::getMessage(XalanMessages::DefaultRootRule_1Param,Constants::ATTRNAME_DATATYPE));
}
else if(parent ==
ete.getStylesheet().getStylesheetRoot().getDefaultRule())
{
@@ -361,17 +361,15 @@
{
const XalanDOMString& uri = node.getURI();
- m_printWriter.print(XALAN_STATIC_UCODE_STRING("Line #"));
- m_printWriter.print(node.getLineNumber());
- m_printWriter.print(XALAN_STATIC_UCODE_STRING(", "));
- m_printWriter.print(XALAN_STATIC_UCODE_STRING("Column #"));
- m_printWriter.print(node.getColumnNumber());
+ m_printWriter.print(XalanMessageLoader::getMessage(
+ XalanMessages::TextAndColumnNumber_2Param
+ ,LongToDOMString(node.getLineNumber())
+ ,LongToDOMString(node.getColumnNumber())));
if (uri.length() != 0)
{
- m_printWriter.print(XALAN_STATIC_UCODE_STRING(", ("));
- m_printWriter.print(uri);
- m_printWriter.print(XALAN_STATIC_UCODE_STRING(")"));
+ m_printWriter.print(XalanMessageLoader::getMessage(
+ XalanMessages::CommaAndBrackets_1Param,uri));
}
}
1.11 +28 -29 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSLTEngineImpl.cpp 5 Nov 2003 22:18:42 -0000 1.10
+++ XSLTEngineImpl.cpp 31 Dec 2003 19:11:21 -0000 1.11
@@ -88,6 +88,7 @@
#include <xalanc/PlatformSupport/PrintWriter.hpp>
#include <xalanc/PlatformSupport/StringTokenizer.hpp>
#include <xalanc/PlatformSupport/XalanLocator.hpp>
+#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
#include <xalanc/PlatformSupport/XalanUnicode.hpp>
@@ -264,7 +265,7 @@
if (0 == stylesheetSource.getSystemId())
{
- xslIdentifier = XALAN_STATIC_UCODE_STRING("Input XSL");
+ xslIdentifier =
XalanMessageLoader::getMessage(XalanMessages::InputXSL);
}
else
{
@@ -368,7 +369,7 @@
if(0 == m_stylesheetRoot)
{
- error(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Failed
to process stylesheet!")));
+
error(XalanMessageLoader::getMessage(XalanMessages::FailedToProcessStylesheet));
}
else if(0 != sourceTree)
{
@@ -391,7 +392,7 @@
if(m_diagnosticsPrintWriter != 0)
{
-
displayDuration(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Total
time")), &totalTimeID);
+
displayDuration(XalanMessageLoader::getMessage(XalanMessages::TotalTime),
&totalTimeID);
}
}
@@ -416,7 +417,7 @@
{
if (m_stylesheetRoot == 0)
{
-
error(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("No stylesheet is
available to process!")));
+
error(XalanMessageLoader::getMessage(XalanMessages::NoStylesheet));
}
FormatterListener* const theFormatter =
@@ -436,7 +437,7 @@
if(m_diagnosticsPrintWriter != 0)
{
-
displayDuration(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Total
time")), &totalTimeID);
+
displayDuration(XalanMessageLoader::getMessage(XalanMessages::TotalTime),
&totalTimeID);
}
}
@@ -478,11 +479,11 @@
if (theType != XalanNode::ELEMENT_NODE && theType !=
XalanNode::DOCUMENT_NODE)
{
-
error(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Compiling a stylesheet
from a DOM instance requires a Document or Element node")));
+
error(XalanMessageLoader::getMessage(XalanMessages::CompilingDOMStylesheetReqDocument));
}
else
{
- xslIdentifier =
XALAN_STATIC_UCODE_STRING("Input XSL");
+ xslIdentifier =
XalanMessageLoader::getMessage(XalanMessages::InputXSL);
FormatterTreeWalker tw(stylesheetProcessor);
@@ -509,7 +510,7 @@
if(m_diagnosticsPrintWriter != 0)
{
- diag(XALAN_STATIC_UCODE_STRING("=========
Parsing ") + xslIdentifier + XALAN_STATIC_UCODE_STRING(" =========="));
+
diag(XalanMessageLoader::getMessage(XalanMessages::Parsing_1Param,
xslIdentifier));
pushTime(&xslIdentifier);
}
@@ -519,7 +520,7 @@
if(m_diagnosticsPrintWriter != 0)
{
-
displayDuration(XALAN_STATIC_UCODE_STRING("Parse of ") + xslIdentifier,
&xslIdentifier);
+
displayDuration(XalanMessageLoader::getMessage(XalanMessages::ParseOf_1Param,
xslIdentifier),&xslIdentifier);
}
}
@@ -544,15 +545,14 @@
{
const XalanDOMString xmlIdentifier = 0 !=
inputSource.getSystemId() ?
XalanDOMString(inputSource.getSystemId()) :
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Input XML"));
+
XalanMessageLoader::getMessage(XalanMessages::InputXML);
if(m_diagnosticsPrintWriter != 0)
{
// In case we have a fragment identifier, go ahead and
// try to parse the XML here.
- diag(XALAN_STATIC_UCODE_STRING("========= Parsing ") +
- xmlIdentifier +
- XALAN_STATIC_UCODE_STRING("
=========="));
+
+
diag(XalanMessageLoader::getMessage(XalanMessages::Parsing_1Param,
xmlIdentifier));
pushTime(&xmlIdentifier);
}
@@ -572,7 +572,7 @@
if(0 != m_diagnosticsPrintWriter)
{
displayDuration(
- XALAN_STATIC_UCODE_STRING("Parse of ") +
xmlIdentifier,
+
XalanMessageLoader::getMessage(XalanMessages::ParseOf_1Param, xmlIdentifier),
&xmlIdentifier);
}
@@ -730,7 +730,7 @@
}
else
{
- error("Could not identify fragment: " + fragID);
+
error(XalanMessageLoader::getMessage(XalanMessages::CantFindFragment_1Param,
fragID));
}
}
@@ -790,7 +790,7 @@
if(nl.getLength() == 0)
{
- error("Could not find fragment: " + fragID);
+
error(XalanMessageLoader::getMessage(XalanMessages::CantFindFragment_1Param,fragID));
}
XalanNode* const frag = nl.item(0);
@@ -837,7 +837,7 @@
if(m_diagnosticsPrintWriter != 0)
{
displayDuration(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("Setup of ")) + localXSLURLString,
+
XalanMessageLoader::getMessage(XalanMessages::SetupOf_1Param,localXSLURLString),
frag);
}
@@ -849,15 +849,14 @@
{
stylesheetDoc = 0;
- error("Node pointed to by fragment identifier was not
an element: " + fragID);
+
error(XalanMessageLoader::getMessage(XalanMessages::NodePointedByFragment,fragID));
}
}
else
{
if(m_diagnosticsPrintWriter != 0)
{
-
diag(XalanDOMString(XALAN_STATIC_UCODE_STRING("========= Parsing and preparing
")) +
- localXSLURLString +
+
diag(XalanMessageLoader::getMessage(XalanMessages::ParsingAndPreparing_1Param,localXSLURLString)
+
XALAN_STATIC_UCODE_STRING("
=========="));
pushTime(&localXSLURLString);
}
@@ -936,7 +935,8 @@
if(m_diagnosticsPrintWriter != 0)
{
- displayDuration("Parsing and init of " +
localXSLURLString, &localXSLURLString);
+
displayDuration(XalanMessageLoader::getMessage(XalanMessages::ParsingAndInitOf_1Param,
localXSLURLString),&localXSLURLString);
+
}
}
@@ -2064,9 +2064,8 @@
const XalanNode* sourceNode,
const LocatorType* locator)
{
- warn(
- "Only text nodes can be copied in this context. The
node is ignored",
- locator,
+
warn(XalanMessageLoader::getMessage(XalanMessages::OnlyTextNodesCanBeCopied),
+ *locator,
sourceNode);
}
@@ -2293,8 +2292,8 @@
else
{
warn(
- "Attempting to add an attribute when
there is no open element. The attribute will be ignored",
- locator,
+
XalanMessageLoader::getMessage(XalanMessages::WrongAttemptingToAddAttrinbute),
+ *locator,
&node);
}
break;
@@ -2324,7 +2323,7 @@
break;
default:
- error("Cannot create item in result tree", locator,
&node);
+
error(XalanMessageLoader::getMessage(XalanMessages::CantCreateItemInResultTree),
*locator, &node);
break;
}
}
@@ -2585,7 +2584,7 @@
if(elemNS == 0)
{
- error("Prefix must resolve to a
namespace: " + prefix);
+
error(XalanMessageLoader::getMessage(XalanMessages::PrefixMustResolveToNamespace_1Param,prefix));
}
else
{
@@ -3423,7 +3422,7 @@
::s_typeString = XALAN_STATIC_UCODE_STRING("type");
- ::s_hrefString = XALAN_STATIC_UCODE_STRING("href");
+ ::s_hrefString = Constants::ATTRNAME_HREF;
::s_piTokenizerString = XALAN_STATIC_UCODE_STRING(" \t=");
1.4 +18 -19 xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp
Index: XalanEXSLTCommon.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanEXSLTCommon.cpp 2 Dec 2003 19:58:56 -0000 1.3
+++ XalanEXSLTCommon.cpp 31 Dec 2003 19:11:22 -0000 1.4
@@ -153,6 +153,23 @@
+static const XalanDOMChar s_objectTypeFunctionName[] =
+{
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_b,
+ XalanUnicode::charLetter_j,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charHyphenMinus,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_y,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_e,
+ 0
+};
+
+
XObjectPtr
XalanEXSLTFunctionObjectType::execute(
XPathExecutionContext&
executionContext,
@@ -214,7 +231,7 @@
const XalanDOMString
XalanEXSLTFunctionObjectType::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"object-type()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_objectTypeFunctionName);
}
@@ -259,24 +276,6 @@
XalanUnicode::charLetter_s,
XalanUnicode::charLetter_e,
XalanUnicode::charLetter_t,
- 0
-};
-
-
-
-static const XalanDOMChar s_objectTypeFunctionName[] =
-{
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_b,
- XalanUnicode::charLetter_j,
- XalanUnicode::charLetter_e,
- XalanUnicode::charLetter_c,
- XalanUnicode::charLetter_t,
- XalanUnicode::charHyphenMinus,
- XalanUnicode::charLetter_t,
- XalanUnicode::charLetter_y,
- XalanUnicode::charLetter_p,
- XalanUnicode::charLetter_e,
0
};
1.6 +202 -202 xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp
Index: XalanEXSLTMath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanEXSLTMath.cpp 2 Dec 2003 19:58:56 -0000 1.5
+++ XalanEXSLTMath.cpp 31 Dec 2003 19:11:22 -0000 1.6
@@ -149,6 +149,18 @@
}
+static const XalanDOMChar s_highestFunctionName[] =
+{
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_g,
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_t,
+ 0
+};
+
XObjectPtr
XalanEXSLTFunctionHighest::execute(
@@ -173,10 +185,21 @@
XalanEXSLTFunctionHighest::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"highest()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_highestFunctionName);
}
+static const XalanDOMChar s_lowestFunctionName[] =
+{
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_w,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_t,
+ 0
+};
+
XObjectPtr
XalanEXSLTFunctionLowest::execute(
@@ -200,7 +223,7 @@
const XalanDOMString
XalanEXSLTFunctionLowest::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"lowest()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_lowestFunctionName);
}
@@ -257,6 +280,14 @@
}
+static const XalanDOMChar s_minFunctionName[] =
+{
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
XObjectPtr
XalanEXSLTFunctionMin::execute(
@@ -280,11 +311,21 @@
const XalanDOMString
XalanEXSLTFunctionMin::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"min()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_minFunctionName);
}
+static const XalanDOMChar s_maxFunctionName[] =
+{
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_x,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionMax::execute(
XPathExecutionContext&
executionContext,
@@ -307,11 +348,21 @@
const XalanDOMString
XalanEXSLTFunctionMax::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"max()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_maxFunctionName);
}
+static const XalanDOMChar s_absFunctionName[] =
+{
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_b,
+ XalanUnicode::charLetter_s,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionAbs::execute(
XPathExecutionContext&
executionContext,
@@ -338,11 +389,24 @@
const XalanDOMString
XalanEXSLTFunctionAbs::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"abs()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_absFunctionName);
}
+static const XalanDOMChar s_randomFunctionName[] =
+{
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_m,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionRandom::execute(
XPathExecutionContext&
executionContext,
@@ -377,11 +441,22 @@
const XalanDOMString
XalanEXSLTFunctionRandom::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsNoArgument_1Param,"random()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsNoArgument_1Param,s_randomFunctionName);
}
+static const XalanDOMChar s_acosFunctionName[] =
+{
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_s,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionAcos::execute(
XPathExecutionContext&
executionContext,
@@ -408,11 +483,23 @@
const XalanDOMString
XalanEXSLTFunctionAcos::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"acos()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_acosFunctionName);
}
+static const XalanDOMChar s_asinFunctionName[] =
+{
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
+
+
XObjectPtr
XalanEXSLTFunctionAsin::execute(
XPathExecutionContext&
executionContext,
@@ -439,11 +526,22 @@
const XalanDOMString
XalanEXSLTFunctionAsin::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"asin()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_asinFunctionName);
}
+static const XalanDOMChar s_atanFunctionName[] =
+{
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionAtan::execute(
XPathExecutionContext&
executionContext,
@@ -470,11 +568,23 @@
const XalanDOMString
XalanEXSLTFunctionAtan::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"atan()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_atanFunctionName);
}
+static const XalanDOMChar s_atan2FunctionName[] =
+{
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charDigit_2,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionAtan2::execute(
XPathExecutionContext&
executionContext,
@@ -501,7 +611,7 @@
const XalanDOMString
XalanEXSLTFunctionAtan2::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsTwoArguments_1Param,"atan2()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsTwoArguments_1Param,s_atan2FunctionName);
}
@@ -964,6 +1074,16 @@
+static const XalanDOMChar s_cosFunctionName[] =
+{
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_s,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionCos::execute(
XPathExecutionContext&
executionContext,
@@ -990,11 +1110,21 @@
const XalanDOMString
XalanEXSLTFunctionCos::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"cos()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_cosFunctionName);
}
+static const XalanDOMChar s_expFunctionName[] =
+{
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_p,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionExp::execute(
XPathExecutionContext&
executionContext,
@@ -1021,11 +1151,21 @@
const XalanDOMString
XalanEXSLTFunctionExp::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"exp()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_expFunctionName);
}
+static const XalanDOMChar s_logFunctionName[] =
+{
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_g,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionLog::execute(
XPathExecutionContext&
executionContext,
@@ -1052,11 +1192,23 @@
const XalanDOMString
XalanEXSLTFunctionLog::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"log()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_logFunctionName);
}
+static const XalanDOMChar s_powerFunctionName[] =
+{
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_w,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_r,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionPower::execute(
XPathExecutionContext&
executionContext,
@@ -1083,11 +1235,21 @@
const XalanDOMString
XalanEXSLTFunctionPower::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsTwoArguments_1Param,"power()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsTwoArguments_1Param,s_powerFunctionName);
}
+static const XalanDOMChar s_sinFunctionName[] =
+{
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionSin::execute(
XPathExecutionContext&
executionContext,
@@ -1114,12 +1276,23 @@
const XalanDOMString
XalanEXSLTFunctionSin::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"sin()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_sinFunctionName);
}
+static const XalanDOMChar s_sqrtFunctionName[] =
+{
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_q,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_t,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionSqrt::execute(
XPathExecutionContext&
executionContext,
@@ -1146,11 +1319,21 @@
const XalanDOMString
XalanEXSLTFunctionSqrt::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"sqrt()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_sqrtFunctionName);
}
+static const XalanDOMChar s_tanFunctionName[] =
+{
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
+
XObjectPtr
XalanEXSLTFunctionTan::execute(
XPathExecutionContext&
executionContext,
@@ -1177,7 +1360,7 @@
const XalanDOMString
XalanEXSLTFunctionTan::getError() const
{
- return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,"tan()");
+ return
XalanMessageLoader::getMessage(XalanMessages::EXSLTFunctionAcceptsOneArgument_1Param,s_tanFunctionName);
}
@@ -1210,60 +1393,6 @@
-static const XalanDOMChar s_absFunctionName[] =
-{
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_b,
- XalanUnicode::charLetter_s,
- 0
-};
-
-
-
-static const XalanDOMChar s_acosFunctionName[] =
-{
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_c,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_s,
- 0
-};
-
-
-
-static const XalanDOMChar s_asinFunctionName[] =
-{
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_s,
- XalanUnicode::charLetter_i,
- XalanUnicode::charLetter_n,
- 0
-};
-
-
-
-static const XalanDOMChar s_atanFunctionName[] =
-{
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_t,
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_n,
- 0
-};
-
-
-
-static const XalanDOMChar s_atan2FunctionName[] =
-{
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_t,
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_n,
- XalanUnicode::charDigit_2,
- 0
-};
-
-
static const XalanDOMChar s_constantFunctionName[] =
{
@@ -1280,135 +1409,6 @@
-static const XalanDOMChar s_cosFunctionName[] =
-{
- XalanUnicode::charLetter_c,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_s,
- 0
-};
-
-
-
-static const XalanDOMChar s_expFunctionName[] =
-{
- XalanUnicode::charLetter_e,
- XalanUnicode::charLetter_x,
- XalanUnicode::charLetter_p,
- 0
-};
-
-
-
-static const XalanDOMChar s_highestFunctionName[] =
-{
- XalanUnicode::charLetter_h,
- XalanUnicode::charLetter_i,
- XalanUnicode::charLetter_g,
- XalanUnicode::charLetter_h,
- XalanUnicode::charLetter_e,
- XalanUnicode::charLetter_s,
- XalanUnicode::charLetter_t,
- 0
-};
-
-
-
-static const XalanDOMChar s_logFunctionName[] =
-{
- XalanUnicode::charLetter_l,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_g,
- 0
-};
-
-
-
-static const XalanDOMChar s_lowestFunctionName[] =
-{
- XalanUnicode::charLetter_l,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_w,
- XalanUnicode::charLetter_e,
- XalanUnicode::charLetter_s,
- XalanUnicode::charLetter_t,
- 0
-};
-
-
-
-static const XalanDOMChar s_maxFunctionName[] =
-{
- XalanUnicode::charLetter_m,
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_x,
- 0
-};
-
-
-
-static const XalanDOMChar s_minFunctionName[] =
-{
- XalanUnicode::charLetter_m,
- XalanUnicode::charLetter_i,
- XalanUnicode::charLetter_n,
- 0
-};
-
-
-
-static const XalanDOMChar s_powFunctionName[] =
-{
- XalanUnicode::charLetter_p,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_w,
- XalanUnicode::charLetter_e,
- XalanUnicode::charLetter_r,
- 0
-};
-
-
-
-static const XalanDOMChar s_sinFunctionName[] =
-{
- XalanUnicode::charLetter_s,
- XalanUnicode::charLetter_i,
- XalanUnicode::charLetter_n,
- 0
-};
-
-
-
-static const XalanDOMChar s_sqrtFunctionName[] =
-{
- XalanUnicode::charLetter_s,
- XalanUnicode::charLetter_q,
- XalanUnicode::charLetter_r,
- XalanUnicode::charLetter_t,
- 0
-};
-
-
-
-static const XalanDOMChar s_tanFunctionName[] =
-{
- XalanUnicode::charLetter_t,
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_n,
- 0
-};
-
-static const XalanDOMChar s_randomFunctionName[] =
-{
- XalanUnicode::charLetter_r,
- XalanUnicode::charLetter_a,
- XalanUnicode::charLetter_n,
- XalanUnicode::charLetter_d,
- XalanUnicode::charLetter_o,
- XalanUnicode::charLetter_m,
- 0
-};
-
static const XalanEXSLTFunctionAbs s_absFunction;
static const XalanEXSLTFunctionAcos s_acosFunction;
static const XalanEXSLTFunctionAsin s_asinFunction;
@@ -1422,7 +1422,7 @@
static const XalanEXSLTFunctionLowest s_lowestFunction;
static const XalanEXSLTFunctionMax s_maxFunction;
static const XalanEXSLTFunctionMin s_minFunction;
-static const XalanEXSLTFunctionPower s_powFunction;
+static const XalanEXSLTFunctionPower s_powerFunction;
static const XalanEXSLTFunctionSin s_sinFunction;
static const XalanEXSLTFunctionSqrt s_sqrtFunction;
static const XalanEXSLTFunctionTan s_tanFunction;
@@ -1444,7 +1444,7 @@
{ s_lowestFunctionName, &s_lowestFunction },
{ s_maxFunctionName, &s_maxFunction },
{ s_minFunctionName, &s_minFunction },
- { s_powFunctionName, &s_powFunction },
+ { s_powerFunctionName, &s_powerFunction },
{ s_sinFunctionName, &s_sinFunction },
{ s_sqrtFunctionName, &s_sqrtFunction },
{ s_tanFunctionName, &s_tanFunction },
1.4 +14 -11
xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesParserLiaison.cpp 4 Dec 2003 06:54:50 -0000 1.3
+++ XercesParserLiaison.cpp 31 Dec 2003 19:11:22 -0000 1.4
@@ -83,6 +83,7 @@
#include <xalanc/PlatformSupport/ExecutionContext.hpp>
+#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
#include <xalanc/PlatformSupport/XalanUnicode.hpp>
@@ -546,7 +547,7 @@
void
XercesParserLiaison::fatalError(const SAXParseExceptionType& e)
{
- XalanDOMString theMessage("Fatal Error");
+ XalanDOMString theMessage =
XalanMessageLoader::getMessage(XalanMessages::FatalError);
formatErrorMessage(e, theMessage);
@@ -572,7 +573,7 @@
void
XercesParserLiaison::error(const SAXParseExceptionType& e)
{
- XalanDOMString theMessage("Error ");
+ XalanDOMString theMessage =
XalanMessageLoader::getMessage(XalanMessages::Error2);
formatErrorMessage(e, theMessage);
@@ -601,7 +602,7 @@
void
XercesParserLiaison::warning(const SAXParseExceptionType& e)
{
- XalanDOMString theMessage("Warning ");
+ XalanDOMString theMessage =
XalanMessageLoader::getMessage(XalanMessages::Warning2);
formatErrorMessage(e, theMessage);
@@ -625,24 +626,26 @@
const SAXParseExceptionType& e,
XalanDOMString&
theMessage)
{
- append(theMessage, " at (file ");
const XalanDOMChar* const theSystemID = e.getSystemId();
if (theSystemID == 0 || length(theSystemID) == 0)
{
- append(theMessage, "<unknown>");
+
+
append(theMessage,XalanMessageLoader::getMessage(XalanMessages::AtUnknownFileLineColumn_2Param
+ ,LongToDOMString(long(e.getLineNumber()))
+ ,LongToDOMString(long(e.getColumnNumber()))
+ ));
}
else
{
- append(theMessage, theSystemID);
+
append(theMessage,XalanMessageLoader::getMessage(XalanMessages::AtFileLineColumn_3Param
+ ,XalanDOMString(theSystemID)
+ ,LongToDOMString(long(e.getLineNumber()))
+ ,LongToDOMString(long(e.getColumnNumber()))
+ ));
}
- append(theMessage, ", line ");
- append(theMessage, LongToDOMString(long(e.getLineNumber())));
- append(theMessage, ", column ");
- append(theMessage, LongToDOMString(long(e.getColumnNumber())));
- append(theMessage, "): ");
append(theMessage, e.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
