Mercurial > forge

changeset 9910:26c9dfb4a501 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Take more than one field for datefmt iff sep contains space
author cdemills
date Thu, 29 Mar 2012 15:21:47 +0000
parents f769e77b4dd3
children 92e41d7346ca
files extra/dataframe/inst/@dataframe/dataframe.m
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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