Diff of /inst/@dataframe/dataframe.m [f9f445] .. [7c0880] Maximize Restore

  Switch to side-by-side view

--- a/inst/@dataframe/dataframe.m
+++ b/inst/@dataframe/dataframe.m
@@ -140,7 +140,7 @@
               df._name{2} = cellstr (num2str (varargin{indi+1}));
           endswitch
           %# detect assignment - functions calls - ranges
-          dummy = cellfun ('size', cellfun (@(x) strsplit (x, ":=("), df._name{2}, \
+          dummy = cellfun ('size', cellfun (@(x) strsplit (x, ":=("), df._name{2}, ...
                                            "UniformOutput", false), 2);
           if (any (dummy > 1))
             warning ('dataframe colnames taken literally and not interpreted');
@@ -243,7 +243,8 @@
 	  [fid, msg] = fopen (dummy, 'rt');
 	else
 	  %# The file we read from external process must be seekable !!!
-	  tmpfile = tmpnam ();
+	  tmpfile = tmpnam (); df._src{end+1, 1} = dummy;
+	  %# quote to protect from spaces in the name
 	  dummy = strcat ('''', dummy, '''');
 	  cmd = [cmd, dummy,  ' > ',  tmpfile];
 	  if (exist ('OCTAVE_VERSION', 'builtin'))
@@ -265,8 +266,7 @@
         unwind_protect
           in = [];
           if (fid ~= -1)
-            df._src{end+1, 1} = dummy;
-            dummy = fgetl (fid);
+	    dummy = fgetl (fid);
 	    if (-1 == dummy)
 	      x = []; %# file is valid but empty
 	    else  
@@ -298,7 +298,7 @@
           %# remove the EOL character(s)
           lines(1 == dummy) = {""};
           %# use a positive lookahead -- eol is not part of the match
-          lines(dummy > 1) = cellfun (@(x) regexp (x, ['.*?(?=' eol ')'], \
+          lines(dummy > 1) = cellfun (@(x) regexp (x, ['.*?(?=' eol ')'], ...
                                                    'match'), lines(dummy > 1));
           %# a field either starts at a word boundary, either by + - . for
           %# a numeric data, either by ' for a string. 
@@ -307,10 +307,10 @@
           %# lines, 'UniformOutput', false); %# extract fields
           
           if (strfind (sep, ' '))
-            content = cellfun (@(x) strsplit (x, sep, true), lines, \
+            content = cellfun (@(x) strsplit (x, sep, true), lines, ...
                                'UniformOutput', false); %# extract fields  
           else
-            content = cellfun (@(x) strsplit (x, sep), lines, \
+            content = cellfun (@(x) strsplit (x, sep), lines, ...
                                'UniformOutput', false); %# extract fields 
           endif
           
@@ -380,7 +380,7 @@
 		if (~ isempty(conv_regexp))
 		  dummy = regexprep (dummy, conv_regexp{});
 		endif
-		the_line = cellfun (@(x) sscanf (x, "%f"), dummy, \
+		the_line = cellfun (@(x) sscanf (x, "%f"), dummy, ...
                                     'UniformOutput', false);
               	
 		indk = 1; indm = 1;
@@ -513,7 +513,7 @@
   
     elseif (~isempty (indj))        
       %# x is an array, generates fieldnames from names given as args
-      if (1 == length (df._name{2}) && length (df._name{2}) < \
+      if (1 == length (df._name{2}) && length (df._name{2}) < ...
           length (indj))
         [df._name{2}(indj, 1),  df._over{2}(1, indj)] ...
             = df_colnames (char (df._name{2}), indj);