Re: [fpc-devel] StrToDateTime issue

2008-06-05 Thread Michael Van Canneyt 


On Wed, 4 Jun 2008, Joao Morais wrote:

 Joao Morais wrote:
  Michael Van Canneyt wrote:
  
   A patch is welcome.
  
  Here it is.
  
  This patch fixes a misbehaviour when space is left in front of the date or
  time, as well as call StrToTime if only a time is provided.
 
 Remember.

Applied. I can't find your original mail, though.

Thanks for the patch !

Michael.
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel

Re: [fpc-devel] StrToDateTime issue

2008-06-04 Thread Joao Morais 

Joao Morais wrote:

Michael Van Canneyt wrote:


A patch is welcome.


Here it is.

This patch fixes a misbehaviour when space is left in front of the date 
or time, as well as call StrToTime if only a time is provided.


Remember.

Joao Morais
Index: rtl/objpas/sysutils/dati.inc
===
--- rtl/objpas/sysutils/dati.inc(revision 11126)
+++ rtl/objpas/sysutils/dati.inc(working copy)
@@ -516,15 +516,37 @@
 end ;
 
 {   StrToDateTime converts the string S to a TDateTime value
-if S does not represent a valid date and time value
+if S does not represent a valid date and/or time value
 an EConvertError will be raised   }
 
 function StrToDateTime(const s: string): TDateTime;
-var i: integer;
+var
+  i, j, k, l: integer;
+  sd, st: string;
 begin
-i := pos(' ', s);
-if i  0 then result := ComposeDateTime(StrToDate(Copy(S, 1, i - 1)), 
StrToTime(Copy(S, i + 1, length(S
-else result := StrToDate(S);
+  l := Length(s);
+  i := 1;
+  while (i = l) and (s[i] = ' ') do
+Inc(i);
+  j := i;
+  while (j = l) and (s[j]  ' ') do
+Inc(j);
+  k := j;
+  while (k = l) and (s[k] = ' ') do
+Inc(k);
+  sd := Copy(s, i, j - i);
+  st := Copy(s, k, l);
+  if (st = '') and (Pos(TimeSeparator, sd)  0) then
+  begin
+st := sd;
+sd := '';
+  end;
+  if (sd  '') and (st  '') then
+Result := ComposeDateTime(StrToDate(sd), StrToTime(st))
+  else if st = '' then
+Result := StrToDate(sd)
+  else
+Result := StrToTime(st);
 end ;
 
 {   FormatDateTime formats DateTime to the given format string FormatStr   }
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel

[fpc-devel] StrToDateTime issue

2008-05-29 Thread Joao Morais 


Hello,

Performing some tests with date and time routines I discovered that 
StrToDateTime doesn't work if I only use time. This was designed that 
way or a patch is welcome?


Joao Morais
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel

Re: [fpc-devel] StrToDateTime issue

2008-05-29 Thread Michael Van Canneyt 


On Thu, 29 May 2008, Joao Morais wrote:

 
 Hello,
 
 Performing some tests with date and time routines I discovered that
 StrToDateTime doesn't work if I only use time. This was designed that way or a
 patch is welcome?

A patch is welcome.

Michael.
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel

Re: [fpc-devel] StrToDateTime issue

2008-05-29 Thread Joao Morais 

Michael Van Canneyt wrote:


On Thu, 29 May 2008, Joao Morais wrote:


Hello,

Performing some tests with date and time routines I discovered that
StrToDateTime doesn't work if I only use time. This was designed that way or a
patch is welcome?


A patch is welcome.


Here it is.

This patch fixes a misbehaviour when space is left in front of the date 
or time, as well as call StrToTime if only a time is provided.


Joao Morais

Index: rtl/objpas/sysutils/dati.inc
===
--- rtl/objpas/sysutils/dati.inc(revision 11126)
+++ rtl/objpas/sysutils/dati.inc(working copy)
@@ -516,15 +516,37 @@
 end ;
 
 {   StrToDateTime converts the string S to a TDateTime value
-if S does not represent a valid date and time value
+if S does not represent a valid date and/or time value
 an EConvertError will be raised   }
 
 function StrToDateTime(const s: string): TDateTime;
-var i: integer;
+var
+  i, j, k, l: integer;
+  sd, st: string;
 begin
-i := pos(' ', s);
-if i  0 then result := ComposeDateTime(StrToDate(Copy(S, 1, i - 1)), 
StrToTime(Copy(S, i + 1, length(S
-else result := StrToDate(S);
+  l := Length(s);
+  i := 1;
+  while (i = l) and (s[i] = ' ') do
+Inc(i);
+  j := i;
+  while (j = l) and (s[j]  ' ') do
+Inc(j);
+  k := j;
+  while (k = l) and (s[k] = ' ') do
+Inc(k);
+  sd := Copy(s, i, j - i);
+  st := Copy(s, k, l);
+  if (st = '') and (Pos(TimeSeparator, sd)  0) then
+  begin
+st := sd;
+sd := '';
+  end;
+  if (sd  '') and (st  '') then
+Result := ComposeDateTime(StrToDate(sd), StrToTime(st))
+  else if st = '' then
+Result := StrToDate(sd)
+  else
+Result := StrToTime(st);
 end ;
 
 {   FormatDateTime formats DateTime to the given format string FormatStr   }
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel