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

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

Revision: 7369
          http://octave.svn.sourceforge.net/octave/?rev=7369&view=rev
Author:   prnienhuis
Date:     2010-05-31 15:19:08 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Added remark in help text about possible significant delays when no range has been specified (as that range must be determined behind the scenes by getusedrange.m first)

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/ods2oct.m
    trunk/octave-forge/main/io/inst/odsread.m
    trunk/octave-forge/main/io/inst/xls2oct.m
    trunk/octave-forge/main/io/inst/xlsread.m

Modified: trunk/octave-forge/main/io/inst/ods2oct.m
===================================================================
--- trunk/octave-forge/main/io/inst/ods2oct.m	2010-05-31 09:29:09 UTC (rev 7368)
+++ trunk/octave-forge/main/io/inst/ods2oct.m	2010-05-31 15:19:08 UTC (rev 7369)
@@ -34,6 +34,8 @@
 ##
 ## @var{range} is expected to be a regular spreadsheet range format,
 ## or "" (empty string, indicating all data in a worksheet).
+## If no range is specified the occupied cell range will have to be
+## determined behind the scenes first; this can take some time.
 ##
 ## If only the first argument is specified, ods2oct will try to read
 ## all contents from the first = leftmost (or the only) worksheet (as
@@ -94,6 +96,7 @@
 ## 2010-04-06 Benchmarked odfdom versions. v0.7.5 is up to 7 times faster than v0.8!
 ##            So I added a warning for users using odfdom 0.8.
 ## 2010-04-11 Removed support for odfdom-0.8 - it's painfully slow and unreliable
+## 2010-05-31 Updated help text (delay i.c.o. empty range due to getusedrange call)
 ##
 ## (Latest update of subfunctions below: 2010-04-13)
 
@@ -361,7 +364,7 @@
 ## Author: Philip Nienhuis
 ## Created: 2009-12-13
 
-function [ rawarr, ods, rstatus] = ods2jod2oct (ods, wsh, crange)
+function [ rawarr, ods, rstatus] = ods_2jod2oct (ods, wsh, crange)
 
 	persistent months;
 	months = {"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"};

Modified: trunk/octave-forge/main/io/inst/odsread.m
===================================================================
--- trunk/octave-forge/main/io/inst/odsread.m	2010-05-31 09:29:09 UTC (rev 7368)
+++ trunk/octave-forge/main/io/inst/odsread.m	2010-05-31 15:19:08 UTC (rev 7369)
@@ -45,6 +45,8 @@
 ##
 ## @var{range} is expected to be a regular spreadsheet range format,
 ## or "" (empty string, indicating all data in a worksheet).
+## If no range is specified the occupied cell range will have to be
+## determined behind the scenes first; this can take some time.
 ##
 ## If only the first argument is specified, odsread will try to read
 ## all contents from the first = leftmost (or the only) worksheet (as
@@ -107,6 +109,7 @@
 ## Updates: 
 ## 2010-01-05 (....)
 ## 2010-03-04 Slight adaptations in texinfo
+## 2010-05-31 Updated help text (delays i.c.o. empty range due to getusedrange call)
 
 function [ numarr, txtarr, rawarr, lim ] = odsread (filename, wsh=1, datrange=[], reqintf=[])
 

Modified: trunk/octave-forge/main/io/inst/xls2oct.m
===================================================================
--- trunk/octave-forge/main/io/inst/xls2oct.m	2010-05-31 09:29:09 UTC (rev 7368)
+++ trunk/octave-forge/main/io/inst/xls2oct.m	2010-05-31 15:19:08 UTC (rev 7369)
@@ -31,6 +31,9 @@
 ##
 ## @var{range} is expected to be a regular spreadsheet range format,
 ## or "" (empty string, indicating all data in a worksheet).
+## If no range is specified the occupied cell range will have to be
+## determined behind the scenes first; this can take some time for the
+## Java-based interfaces.
 ##
 ## If only the first argument is specified, xls2oct will try to read
 ## all contents from the first = leftmost (or the only) worksheet (as
@@ -94,7 +97,8 @@
 ## Updates: 
 ## 2009-01-03 (added OOXML support & cleaned up code. Excel 
 ##             ADDRESS function still not working OK)
-## 2010-03-14 Updated help text   
+## 2010-03-14 Updated help text
+## 2010-05-31 Updated help text (delay i.c.o. empty range due to getusedrange call)
 
 function [ rawarr, xls, rstatus ] = xls2oct (xls, wsh, datrange='')
 

Modified: trunk/octave-forge/main/io/inst/xlsread.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsread.m	2010-05-31 09:29:09 UTC (rev 7368)
+++ trunk/octave-forge/main/io/inst/xlsread.m	2010-05-31 15:19:08 UTC (rev 7369)
@@ -40,6 +40,9 @@
 ##
 ## @var{range} is expected to be a regular spreadsheet range format,
 ## or "" (empty string, indicating all data in a worksheet).
+## If no range is specified the occupied cell range will have to be
+## determined behind the scenes first; this can take some time for the
+## Java-based interfaces.
 ##
 ## @var{wsh} is either numerical or text, in the latter case it is 
 ## case-sensitive and it may be max. 31 characters long.
@@ -118,6 +121,7 @@
 ## Updates: 
 ## 2009-12-29 bug fixes
 ## 2010-01-12 added unwind_protect to get rid of stray Excel invocations i.c.o. COM errors
+## 2010-05-31 Updated help text (delays i.c.o. empty range due to getusedrange call)
 
 function [ numarr, txtarr, rawarr, lims ] = xlsread (fn, wsh, datrange, reqintf=[])
 


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