2005-06-29 Atsushi Enomoto <[email protected]>

	* XmlConvert.cs : ToTimeSpan() should accept milliseconds (according
	  to ISO 8601 and XSD datatypes 3.2.6.1).

	* XmlConvertTests.cs : added timespan milliseconds testcase.


svn path=/trunk/mcs/; revision=46727

mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,3 +1,8 @@
+2005-06-29  Atsushi Enomoto <[email protected]>
+
+	* XmlConvert.cs : ToTimeSpan() should accept milliseconds (according
+	  to ISO 8601 and XSD datatypes 3.2.6.1).
+
 2005-06-27  Andrew Skiba  <[email protected]>
 
 	* DTDReader.cs : don't validate entity values, when the entry is

mcs/class/System.XML/System.Xml/XmlConvert.cs

@@ -542,6 +542,8 @@ namespace System.Xml {
 			int hours = 0;
 			int minutes = 0;
 			int seconds = 0;
+			int milliseconds = 0;
+			int parsedDigits = 0;
 
 			bool error = false;
 
@@ -554,11 +556,19 @@ namespace System.Xml {
 					start = i;
 					continue;
 				}
-				for (; i < s.Length; i++) {
-					if (!Char.IsDigit (s [i]))
+				for (; i < s.Length; i++)
+					if (s [i] < '0' || '9' < s [i])
 						break;
-				}
+				if (parseStep == 7)
+					parsedDigits = i - start;
 				int value = int.Parse (s.Substring (start, i - start), CultureInfo.InvariantCulture);
+				if (parseStep == 7) {
+					// adjust to 3 digits so that it makes sense as millisecond digits
+					while (parsedDigits > 3)
+						value /= 10;
+					while (parsedDigits < 3)
+						value *= 10;
+				}
 				switch (s [i]) {
 				case 'Y':
 					days += value * 365;
@@ -593,11 +603,20 @@ namespace System.Xml {
 						parseStep = 5;
 					break;
 				case 'S':
-					seconds = value;
-					if (!isTime || parseStep > 6)
+					if (parseStep == 7)
+						milliseconds = value;
+					else
+						seconds = value;
+					if (!isTime || parseStep > 7)
 						error = true;
 					else
-						parseStep = 7;
+						parseStep = 8;
+					break;
+				case '.':
+					if (parseStep > 7)
+						error = true;
+					seconds = value;
+					parseStep = 7;
 					break;
 				default:
 					error = true;
@@ -610,7 +629,7 @@ namespace System.Xml {
 			}
 			if (error)
 				throw new ArgumentException ("Invalid format string for duration schema datatype.");
-			TimeSpan ts = new TimeSpan (days, hours, minutes, seconds);
+			TimeSpan ts = new TimeSpan (days, hours, minutes, seconds, milliseconds);
 			return minusValue ? -ts : ts;
 		}
 

mcs/class/System.XML/Test/System.Xml/ChangeLog

@@ -1,3 +1,7 @@
+2005-06-29  Atsushi Enomoto <[email protected]>
+
+	* XmlConvertTests.cs : added timespan milliseconds testcase.
+
 2005-06-27  Atsushi Enomoto <[email protected]>
 
 	* XmlTextReaderTests.cs : added a testcase for not-wf entity 

mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs

@@ -256,7 +256,8 @@ namespace MonoTests.System.Xml
 		[Test]
 		public void ToTimeSpan ()//not done
 		{
-			
+			AssertEquals ("#1", new TimeSpan (0, 0, 0, 0, 1),
+				XmlConvert.ToTimeSpan ("PT0.001S"));
 		}
 		
 		[Test]