[Octave-cvsupdate] SF.net SVN: octave:[8048] trunk/octave-forge/main/io/inst

[<prn...@us...>]

Revision: 8048
          http://octave.svn.sourceforge.net/octave/?rev=8048&view=rev
Author:   prnienhuis
Date:     2011-01-03 20:39:57 +0000 (Mon, 03 Jan 2011)

Log Message:
-----------
Small bugfixes + info header text corrections

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/oct2xls.m
    trunk/octave-forge/main/io/inst/xls2oct.m
    trunk/octave-forge/main/io/inst/xlsclose.m

Modified: trunk/octave-forge/main/io/inst/oct2xls.m
===================================================================
--- trunk/octave-forge/main/io/inst/oct2xls.m	2011-01-03 20:39:19 UTC (rev 8047)
+++ trunk/octave-forge/main/io/inst/oct2xls.m	2011-01-03 20:39:57 UTC (rev 8048)
@@ -100,6 +100,7 @@
 ## 2010-08-25 Improved help text (section on java memory usage)
 ## 2010-11-12 Moved ptr struct check into main func. More input validity checks
 ## 2010-11-13 Added check for 2-D input array
+## 2010-12-01 Better check on file pointer struct (ischar (xls.xtype))
 
 ## Last script file update (incl. subfunctions): 2011-11-12
 
@@ -120,11 +121,13 @@
 		error ("oct2xls: input array neither cell nor numeric array");
 	endif
 	if (ndims (c_arr) > 2), error ("Only 2-dimensional arrays can be written to spreadsheet"); endif
+	
 	# Check xls file pointer struct
 	test1 = ~isfield (xls, "xtype");
 	test1 = test1 || ~isfield (xls, "workbook");
 	test1 = test1 || isempty (xls.workbook);
 	test1 = test1 || isempty (xls.app);
+	test1 = test1 || ischar (xls.xtype);
 	if (test1)
 		error ("Invalid xls file pointer struct");
 	endif

Modified: trunk/octave-forge/main/io/inst/xls2oct.m
===================================================================
--- trunk/octave-forge/main/io/inst/xls2oct.m	2011-01-03 20:39:19 UTC (rev 8047)
+++ trunk/octave-forge/main/io/inst/xls2oct.m	2011-01-03 20:39:57 UTC (rev 8048)
@@ -126,12 +126,13 @@
 	test1 = test1 || isempty (xls.workbook);
 	test1 = test1 || isempty (xls.app);
 	if test1
-		error ("Invalid xls file struct");
+		error ("Invalid xls file pointer struct");
 	endif
 	# Check worksheet ptr
 	if (~(ischar (wsh) || isnumeric (wsh))), error ("Integer (index) or text (wsh name) expected for arg # 2"); endif
 	# Check range
 	if (~(isempty (datrange) || ischar (datrange))), error ("Character string (range) expected for arg # 3"); endif
+
 	# Check & setup options struct
 	if (nargin < 4 || isempty (spsh_opts))
 		spsh_opts.formulas_as_text = 0;

Modified: trunk/octave-forge/main/io/inst/xlsclose.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsclose.m	2011-01-03 20:39:19 UTC (rev 8047)
+++ trunk/octave-forge/main/io/inst/xlsclose.m	2011-01-03 20:39:57 UTC (rev 8048)
@@ -77,7 +77,7 @@
 					warning ("JXL doesn't support changing filename, new filename ignored.");
 				elseif ~(strcmp (xls.xtype, 'COM') || strmatch ('.xls', filename))
 					# Excel / ActiveX will write any filename extension
-					error ('No .xls or .xlsx filename extension specified');
+					error ('No .xls or .xlsx extension lacking in filename %s', filename);
 				else
 					### For multi-user environments, uncomment below AND relevant stanza in xlsopen
 					# In case of COM, be sure to first close the open workbook


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