[Octave-cvsupdate] octave-forge/main/octcdf ov-ncfile.cc, 1.6, 1.7 nctest.m, 1.2, 1.3

[alex <aba...@us...>]

Update of /cvsroot/octave/octave-forge/main/octcdf
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25252

Modified Files:
	ov-ncfile.cc nctest.m 
Log Message:
calls like nc('dimension name') return the dimension object in order to be compatible with the Matlab toolbox

Index: ov-ncfile.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/ov-ncfile.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ov-ncfile.cc	2 May 2006 14:51:41 -0000	1.6
+++ ov-ncfile.cc	5 Jun 2006 16:19:04 -0000	1.7
@@ -22,6 +22,7 @@
 #include "ov-ncfile.h"
 #include "ov-ncvar.h"
 #include "ov-ncatt.h"
+#include "ov-ncdim.h"
 
 
 
@@ -334,14 +335,22 @@
    	  return  octave_value();
 	}
 
-	status = nc_inq_dimlen(get_ncid(), dimid, &length);
+	// previously a call like nc('dimension name') return the size of the dimension,
+	// now it return the dimension object in order to be compatible with the 
+	// Matlab toolbox.
 
-	if (status != NC_NOERR) {
-	  error("Error while querying dimension %s: %s",name.c_str(), nc_strerror(status));
-   	  return  octave_value();
-	}
+#       if 0
+ 	status = nc_inq_dimlen(get_ncid(), dimid, &length);
+
+ 	if (status != NC_NOERR) {
+ 	  error("Error while querying dimension %s: %s",name.c_str(), nc_strerror(status));
+    	  return  octave_value();
+ 	}
+ 	retval = octave_value(length);
+#       else
+	retval = octave_value(new octave_ncdim(this,dimid));
+#       endif
 
-	retval = octave_value(length);
 	break;
       }
     case '{': {

Index: nctest.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/nctest.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nctest.m	2 May 2006 15:02:15 -0000	1.2
+++ nctest.m	5 Jun 2006 16:19:04 -0000	1.3
@@ -38,8 +38,8 @@
 %!test
 %! nc('time') = 5;
 %! nc('space') = 3;
-%! assert(nc('time'),5);
-%! assert(nc('space'),3);
+%! assert(length(nc('time')),5);
+%! assert(length(nc('space')),3);
 
 %!# Test reading/writing global attributes
 %!test