# HG changeset patch
# User cdemills
# Date 1333034507 0
# Node ID 26c9dfb4a501473c857ef51c4a83b8bcbc82a862
# Parent  f769e77b4dd361997941f3fe7ae919656eeb6a38
  - Take more than one field for datefmt iff sep contains space

diff -r f769e77b4dd3 -r 26c9dfb4a501 extra/dataframe/inst/@dataframe/dataframe.m
--- a/extra/dataframe/inst/@dataframe/dataframe.m	Thu Mar 29 15:09:25 2012 +0000
+++ b/extra/dataframe/inst/@dataframe/dataframe.m	Thu Mar 29 15:21:47 2012 +0000
@@ -162,7 +162,12 @@
 if (~isempty (datefmt))
   %# replace consecutive spaces by one
   datefmt =  regexprep (datefmt, '[ ]+', ' ');
-  datefields = 1 + length (regexp (datefmt, ' '));
+  %# is "space" used as separator ? Then we may take more than one field. 
+  if (~isempty (regexp (sep, ' ')))
+    datefields = 1 + length (regexp (datefmt, ' '));
+  else
+    datefields = 1; 
+  endif
 else
   datefields = 1;
 endif
@@ -323,6 +328,9 @@
                   for indc = (2:datefields)
                     datetime = cstrcat(datetime, ' ', dummy{indk+indc-1});
                   endfor
+                else
+                  %# ensure spaces are unique
+                  datetime =  regexprep (datetime, '[ ]+', ' ');
                 endif
                 
                 try