Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30074/src/modules/plain
Modified Files:
monettime.mx
Log Message:
propagated changes of Wednesday Nov 28 2007 - Friday Nov 30 2007
from the MonetDB_4-20 branch to the development trunk
Index: monettime.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/monettime.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- monettime.mx 9 Jul 2007 08:44:36 -0000 1.5
+++ monettime.mx 30 Nov 2007 12:31:56 -0000 1.6
@@ -1290,13 +1290,14 @@
}
d = &(*ret)->days;
t = &(*ret)->msecs;
+ (*ret)->msecs = 0;
s += date_fromstr(buf, len, &d);
if (s > buf && (*(s) == '@' || *s == ' ' || *s == '-')) {
while (*(++s) == ' ')
;
pos = daytime_fromstr(s, len, &t);
s = pos ? s + pos : buf;
- } else {
+ } else if (!s || *s) {
(*ret)->msecs = daytime_nil;
}
if (s <= buf || (*ret)->days == date_nil || (*ret)->msecs ==
daytime_nil) {
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
