Author: amassari
Date: Thu Sep 6 06:23:25 2007
New Revision: 573256
URL: http://svn.apache.org/viewvc?rev=573256&view=rev
Log:
When validating a date, the error message related to the day value was always
stating that the valid range was 1 to 31, even if the month allowed a narrower
range
Modified:
xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp
Modified: xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml (original)
+++ xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Thu Sep 6
06:23:25 2007
@@ -799,7 +799,7 @@
<Message Id="DateTime_tz_invalid" Text="Invalid TimeZone!
'{0}' "/>
<Message Id="DateTime_year_zero" Text="The year (0000) is
an illegal year value! '{0}' "/>
<Message Id="DateTime_mth_invalid" Text="The month must
have values 1 to 12! '{0}' "/>
- <Message Id="DateTime_day_invalid" Text="The day must have
values 1 to 31! '{0}' "/>
+ <Message Id="DateTime_day_invalid" Text="The day must have
values 1 to {1}! '{0}' "/>
<Message Id="DateTime_hour_invalid" Text="Hour must have
values 0-23! '{0}' "/>
<Message Id="DateTime_min_invalid" Text="Minute must have
values 0-59! '{0}' "/>
<Message Id="DateTime_second_invalid" Text="Second must have
values 0-60! '{0}' "/>
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt Thu Sep
6 06:23:25 2007
@@ -800,7 +800,7 @@
"Invalid TimeZone! '{0}' " ,
"The year (0000) is an illegal year value! '{0}' " ,
"The month must have values 1 to 12! '{0}' " ,
- "The day must have values 1 to 31! '{0}' " ,
+ "The day must have values 1 to {1}! '{0}' " ,
"Hour must have values 0-23! '{0}' " ,
"Minute must have values 0-59! '{0}' " ,
"Second must have values 0-60! '{0}' " ,
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Thu Sep 6 06:23:25 2007
@@ -1592,8 +1592,8 @@
0x0076,0x0061,0x006C,0x0075,0x0065,0x0021,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x00
}
, {
0x0054,0x0068,0x0065,0x0020,0x006D,0x006F,0x006E,0x0074,0x0068,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x0031,0x0020,0x0074,0x006F,0x0020,0x0031,0x0032,0x0021,
0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x00 }
- , {
0x0054,0x0068,0x0065,0x0020,0x0064,0x0061,0x0079,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x0031,0x0020,0x0074,0x006F,0x0020,0x0033,0x0031,0x0021,0x0020,0x0027,
- 0x007B,0x0030,0x007D,0x0027,0x0020,0x00 }
+ , {
0x0054,0x0068,0x0065,0x0020,0x0064,0x0061,0x0079,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x0031,0x0020,0x0074,0x006F,0x0020,0x007B,0x0031,0x007D,0x0021,0x0020,
+ 0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x00 }
, {
0x0048,0x006F,0x0075,0x0072,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x0030,0x002D,0x0032,0x0033,0x0021,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x00
}
, {
0x004D,0x0069,0x006E,0x0075,0x0074,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x0030,0x002D,0x0035,0x0039,0x0021,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,
0x0020,0x00 }
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Thu Sep 6 06:23:25 2007
@@ -783,7 +783,7 @@
345 Invalid TimeZone! '{0}'
346 The year (0000) is an illegal year value! '{0}'
347 The month must have values 1 to 12! '{0}'
-348 The day must have values 1 to 31! '{0}'
+348 The day must have values 1 to {1}! '{0}'
349 Hour must have values 0-23! '{0}'
350 Minute must have values 0-59! '{0}'
351 Second must have values 0-60! '{0}'
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc Thu Sep 6
06:23:25 2007
@@ -885,7 +885,7 @@
8537
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0054\x0069\x006D\x0065\x005A\x006F\x006E\x0065\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
8538
L"\x0054\x0068\x0065\x0020\x0079\x0065\x0061\x0072\x0020\x0028\x0030\x0030\x0030\x0030\x0029\x0020\x0069\x0073\x0020\x0061\x006E\x0020\x0069\x006C\x006C\x0065\x0067\x0061\x006C\x0020\x0079\x0065\x0061\x0072\x0020\x0076\x0061\x006C\x0075\x0065\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
8539
L"\x0054\x0068\x0065\x0020\x006D\x006F\x006E\x0074\x0068\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0031\x0020\x0074\x006F\x0020\x0031\x0032\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
- 8540
L"\x0054\x0068\x0065\x0020\x0064\x0061\x0079\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0031\x0020\x0074\x006F\x0020\x0033\x0031\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
+ 8540
L"\x0054\x0068\x0065\x0020\x0064\x0061\x0079\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0031\x0020\x0074\x006F\x0020\x007B\x0031\x007D\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
8541
L"\x0048\x006F\x0075\x0072\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0030\x002D\x0032\x0033\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
8542
L"\x004D\x0069\x006E\x0075\x0074\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0030\x002D\x0035\x0039\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
8543
L"\x0053\x0065\x0063\x006F\x006E\x0064\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x0030\x002D\x0036\x0030\x0021\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x00"
Modified: xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp?rev=573256&r1=573255&r2=573256&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp Thu Sep 6 06:23:25 2007
@@ -1279,9 +1279,12 @@
if ( fValue[Day] > maxDayInMonthFor( fValue[CentYear], fValue[Month]) ||
fValue[Day] == 0 )
{
- ThrowXMLwithMemMgr1(SchemaDateTimeException
+ XMLCh szMaxDay[3];
+ XMLString::binToText(maxDayInMonthFor( fValue[CentYear],
fValue[Month]), szMaxDay, 3, 10, fMemoryManager);
+ ThrowXMLwithMemMgr2(SchemaDateTimeException
, XMLExcepts::DateTime_day_invalid
, fBuffer
+ , szMaxDay
, fMemoryManager);
//"The day must have values 1 to 31");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
