[Octave-cvsupdate] SF.net SVN: octave:[10096] trunk/octave-forge/extra/dataframe/inst/@ dataframe/dataframe.m

[<cde...@us...>]

Revision: 10096
          http://octave.svn.sourceforge.net/octave/?rev=10096&view=rev
Author:   cdemills
Date:     2012-03-29 15:21:47 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
  - Take more than one field for datefmt iff sep contains space

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2012-03-29 15:09:25 UTC (rev 10095)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2012-03-29 15:21:47 UTC (rev 10096)
@@ -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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.