Thread: [Getdata-commits] SF.net SVN: getdata:[581] trunk/getdata (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 581
          http://getdata.svn.sourceforge.net/getdata/?rev=581&view=rev
Author:   ketiltrout
Date:     2011-04-20 22:42:47 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
gd_error_count bindings.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/TODO
    trunk/getdata/bindings/cxx/dirfile.cpp
    trunk/getdata/bindings/cxx/getdata/dirfile.h
    trunk/getdata/bindings/f77/fgetdata.c
    trunk/getdata/bindings/f77/getdata.f.in
    trunk/getdata/bindings/f77/getdata.f90.in
    trunk/getdata/bindings/idl/getdata.c
    trunk/getdata/bindings/make_parameters.c
    trunk/getdata/bindings/perl/GetData.pm.in
    trunk/getdata/bindings/perl/GetData.xs
    trunk/getdata/bindings/perl/Makefile.am
    trunk/getdata/bindings/perl/simple_funcs.xsin
    trunk/getdata/bindings/python/pydirfile.c
    trunk/getdata/doc/README.cxx
    trunk/getdata/doc/README.f77
    trunk/getdata/doc/README.f95
    trunk/getdata/doc/README.idl
    trunk/getdata/man/gd_error_count.3

Modified: trunk/getdata/ChangeLog
===================================================================

--- trunk/getdata/ChangeLog	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/ChangeLog	2011-04-20 22:42:47 UTC (rev 581)
@@ -1,3 +1,18 @@
+2011-04-21   D. V. Wiebe <ge...@ke...> svn:581
+	* bindings/python/pydirfile.c (gdpy_dirfile_geterrorcount): Added.
+	* bindings/cxx/dirfile.cpp (Dirfile::ErrorCount): Added.
+	* bindings/f77/fgetdata.c (GDECNT): Added.
+	* bindings/f77/fgetdata.f90.in (fgd_error_count): Added.
+	* bindings/idl/getdata.c (gdidl_error_count): Added.
+
+	* bindings/perl/GetData.xs (gdp_to_entry): Fix initialisation of n for
+	LINCOM and POLYNOM.
+
+	* bindings/perl/GetData.pm.in: add constants and functions export tags.
+
+	* bindings/make_parameters.c (Perl): Don't insert unnecessary newlines.
+	* bindings/perl/Makefile.am: Use perl to generate funclist.sed.
+
 2011-04-20   D. V. Wiebe <ge...@ke...> svn:580
 	* test/error_num.c: Added.
 	* src/errors.c (gd_error_count): Added.

Modified: trunk/getdata/TODO
===================================================================
--- trunk/getdata/TODO	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/TODO	2011-04-20 22:42:47 UTC (rev 581)
@@ -9,4 +9,3 @@
 * aliasing [MT]
 * Fix REFERENCE spam [MT]
 * Fragment encapsulation [MT/CBN]
-* gd_error_count bindings

Modified: trunk/getdata/bindings/cxx/dirfile.cpp
===================================================================
--- trunk/getdata/bindings/cxx/dirfile.cpp	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/cxx/dirfile.cpp	2011-04-20 22:42:47 UTC (rev 581)
@@ -139,6 +139,11 @@
   return gd_error(D);
 }
 
+int Dirfile::ErrorCount()
+{
+  return gd_error_count(D);
+}
+
 const char *Dirfile::ErrorString(size_t __gd_unused n)
 {
   return ErrorString();

Modified: trunk/getdata/bindings/cxx/getdata/dirfile.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/dirfile.h	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/cxx/getdata/dirfile.h	2011-04-20 22:42:47 UTC (rev 581)
@@ -111,6 +111,8 @@
 
       int Error() const;
 
+      int ErrorCount();
+
       const char *ErrorString();
       const char *ErrorString(size_t n) gd_deprecated;
 

Modified: trunk/getdata/bindings/f77/fgetdata.c
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.c	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/f77/fgetdata.c	2011-04-20 22:42:47 UTC (rev 581)
@@ -385,6 +385,16 @@
   dreturn("%i", *error);
 }
 
+/* gd_error_count wrapper */
+void F77_FUNC(gderor, GDECNT) (int* error_count, const int* dirfile)
+{
+  dtrace("%p, %i", error, *dirfile);
+
+  *error_count = gd_error_count(_GDF_GetDirfile(*dirfile));
+
+  dreturn("%i", *error_count);
+}
+
 /* gd_error_string wrapper */
 void F77_FUNC(gdestr, GDESTR) (const int* dirfile, char* buffer, const int* len)
 {

Modified: trunk/getdata/bindings/f77/getdata.f.in
===================================================================
--- trunk/getdata/bindings/f77/getdata.f.in	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/f77/getdata.f.in	2011-04-20 22:42:47 UTC (rev 581)
@@ -115,6 +115,8 @@
       EXTERNAL GDDELE
 C     Corresponding to gd_discard(3)
       EXTERNAL GDDSCD
+C     Corresponding to gd_error_count(3)
+      EXTERNAL GDECNT
 C     Corresponding to gd_entry_type(3)
       EXTERNAL GDENTY
 C     Corresponding to gd_error(3)

Modified: trunk/getdata/bindings/f77/getdata.f90.in
===================================================================
--- trunk/getdata/bindings/f77/getdata.f90.in	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/f77/getdata.f90.in	2011-04-20 22:42:47 UTC (rev 581)
@@ -769,6 +769,14 @@
   call gderor(fgd_error, dirfile)
 end function
 
+function fgd_error_count (dirfile)
+  integer :: fgd_error_count
+  integer, intent(in) :: dirfile
+
+  ! call f77 library
+  call gdecnt(fgd_error_count, dirfile)
+end function
+
 subroutine fgd_error_string (dirfile, buffer, len)
   integer, intent(in) :: dirfile, len
   character (len=*), intent(out) :: buffer

Modified: trunk/getdata/bindings/idl/getdata.c
===================================================================
--- trunk/getdata/bindings/idl/getdata.c	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/idl/getdata.c	2011-04-20 22:42:47 UTC (rev 581)
@@ -3803,6 +3803,18 @@
   return r;
 }
 
+/* @@DLM: F gdidl_error_count GD_ERROR_COUNT 1 1 */
+IDL_VPTR gdidl_error_count(int argc, IDL_VPTR argv[], char *argk)
+{
+  dtraceidl();
+
+  int err = gd_error_count(gdidl_get_dirfile(IDL_LongScalar(argv[0])));
+
+  IDL_VPTR r = IDL_GettmpInt(err);
+  dreturn("%p", r);
+  return r;
+}
+
 /* @@DLM: F gdidl_error_string GD_ERROR_STRING 1 1 */
 IDL_VPTR gdidl_error_string(int argc, IDL_VPTR argv[], char *argk)
 {

Modified: trunk/getdata/bindings/make_parameters.c
===================================================================
--- trunk/getdata/bindings/make_parameters.c	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/make_parameters.c	2011-04-20 22:42:47 UTC (rev 581)
@@ -362,7 +362,7 @@
   printf("s/@PARAMLIST@/");
 
   for (i = 0; constant_list[i].lname != NULL; ++i)
-    printf("%s\\\n", constant_list[i].sname, constant_list[i].value);
+    printf("%s ", constant_list[i].sname, constant_list[i].value);
   printf("/\n");
 }
 

Modified: trunk/getdata/bindings/perl/GetData.pm.in
===================================================================
--- trunk/getdata/bindings/perl/GetData.pm.in	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/perl/GetData.pm.in	2011-04-20 22:42:47 UTC (rev 581)
@@ -29,10 +29,8 @@
 require Math::Complex;
 
 our @ISA = qw(Exporter);
-our %EXPORT_TAGS = ( 'all' => [ qw(VERSION
-    @FUNCLIST@
-    @PARAMLIST@
-    ) ] );
+our %EXPORT_TAGS = ( 'all' => [ qw(VERSION @FUNCLIST@ @PARAMLIST@) ],
+'constants' => [ qw(VERSION @PARAMLIST@) ], 'functions' => [ qw(@FUNCLIST@) ]);
 
 our @EXPORT_OK = ( @{$EXPORT_TAGS{'all'}} );
 our @EXPORT = qw();

Modified: trunk/getdata/bindings/perl/GetData.xs
===================================================================
--- trunk/getdata/bindings/perl/GetData.xs	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/perl/GetData.xs	2011-04-20 22:42:47 UTC (rev 581)
@@ -276,7 +276,7 @@
       break;
     case GD_LINCOM_ENTRY:
       GDP_EHASH_FETCH_IV("n_fields", n_fields, int);
-      n = (E->n_fields > GD_MAX_LINCOM) ? GD_MAX_LINCOM : n;
+      n = (E->n_fields > GD_MAX_LINCOM) ? GD_MAX_LINCOM : E->n_fields;
       gdp_fetch_in_fields(E->in_fields, sv, n, pkg, func);
       E->comp_scal = 1;
       gdp_fetch_cmp_list(E->cm, (HV*)sv, "cm", n, pkg, func);
@@ -299,7 +299,7 @@
     case GD_POLYNOM_ENTRY:
       GDP_EHASH_FETCH_PV("in_field", in_fields[0]);
       GDP_EHASH_FETCH_IV("poly_ord", poly_ord, int);
-      n = (E->poly_ord > GD_MAX_POLYORD) ? GD_MAX_POLYORD : n;
+      n = (E->poly_ord > GD_MAX_POLYORD) ? GD_MAX_POLYORD : E->poly_ord;
       E->comp_scal = 1;
       gdp_fetch_cmp_list(E->ca, (HV*)sv, "ca", n, pkg, func);
       gdp_fetch_scalars(E, (HV*)sv, (1 << (n + 1)) - 1, pkg, func);

Modified: trunk/getdata/bindings/perl/Makefile.am
===================================================================
--- trunk/getdata/bindings/perl/Makefile.am	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/perl/Makefile.am	2011-04-20 22:42:47 UTC (rev 581)
@@ -47,10 +47,9 @@
 	$(PERL) simple_funcs.pl $< > $@
 
 funclist.sed: GetData.c
-	echo $(ECHO_N) "s/@FUNCLIST@/" > $@
-	$(AWK) '/^XS\(XS_GetData_.*\);/ {print $$1}' $< | \
-		$(SED) -e 's/.*XS_GetData_\(.*\));/\1\\/' >> $@
-	echo / >> $@
+	$(PERL) -ne 'BEGIN { print "s/\@FUNCLIST@/" }' \
+	-e 'print "$$1 " if /^XS\(XS_GetData_([a-z].*)\);/;' \
+	-e 'END { print "/\n" }' $< > $@
 
 make_parameters.sed: ../make_parameters ../../src/getdata.h
 	  ../make_parameters P > $@

Modified: trunk/getdata/bindings/perl/simple_funcs.xsin
===================================================================
--- trunk/getdata/bindings/perl/simple_funcs.xsin	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/perl/simple_funcs.xsin	2011-04-20 22:42:47 UTC (rev 581)
@@ -117,3 +117,4 @@
 off64_t nframes64(DIRFILE *dirfile)
 off64_t bof64(DIRFILE *dirfile, const char* field_code)
 off64_t eof64(DIRFILE *dirfile, const char* field_code)
+int error_count(DIRFILE *dirfile)

Modified: trunk/getdata/bindings/python/pydirfile.c
===================================================================
--- trunk/getdata/bindings/python/pydirfile.c	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/bindings/python/pydirfile.c	2011-04-20 22:42:47 UTC (rev 581)
@@ -728,6 +728,17 @@
   return error;
 }
 
+static PyObject* gdpy_dirfile_geterrorcount(struct gdpy_dirfile_t* self,
+    void* closure)
+{
+  dtrace("%p, %p", self, closure);
+
+  PyObject* count = PyInt_FromLong(gd_error_count(self->D));
+
+  dreturn("%p", count);
+  return count;
+}
+
 static PyObject* gdpy_dirfile_getfragment(struct gdpy_dirfile_t* self,
     void* args, void* keys)
 {
@@ -2067,6 +2078,12 @@
       "errors, it is typically not necessary to check this value; use a\n"
       "try/except statement instead.  See gd_error(3).",
     NULL },
+  { "error_count", (getter)gdpy_dirfile_geterrorcount, NULL,
+    "The number of errors encountered by the GetData library for this\n"
+      /* -----------------------------------------------------------------| */
+      "dirfile since the last time this member was accessed.  Note:\n"
+      "accessing this member, resets it to zero.  See gd_error_count(3).",
+    NULL },
   { "error_string", (getter)gdpy_dirfile_geterrorstring, NULL,
     "A human-readable description of the last error encountered by the\n"
       "GetData library for this dirfile.  See gd_error_string(3).",
@@ -2214,7 +2231,6 @@
       "field.  If NumPy support is present in pygetdata, and 'as_list' is\n"
       "not given or zero, the values will be returned in NumPy arrays;\n"
       "otherwise, the values will be returned as lists.\n\n"
-      /* -----------------------------------------------------------------| */
       "The 'return_type' parameter indicates the desired type of the values\n"
       "returned, and should be (typically) one of: pygetdata.INT,\n"
       "pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"

Modified: trunk/getdata/doc/README.cxx
===================================================================
--- trunk/getdata/doc/README.cxx	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/doc/README.cxx	2011-04-20 22:42:47 UTC (rev 581)
@@ -47,9 +47,15 @@
 
 * int Dirfile::Error()
 
-  The Error method provides access to the error member of the underlying
-  DIRFILE* object.
+  The Error method calls gd_error(3) to return the error status of the last
+  GetData library call on this Dirfile object.
 
+* int Dirfile::ErrorCount()
+
+  The ErrorCount method calls gd_error_count(3) to return the number of errors
+  encountered by the GetData library on this Dirfile object since this method
+  was last called (or, the first time, since the object was created)..
+
 * const char *Dirfile::ErrorString()
 * const char *Dirfile::ErrorString(size_t len)
 

Modified: trunk/getdata/doc/README.f77
===================================================================
--- trunk/getdata/doc/README.f77	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/doc/README.f77	2011-04-20 22:42:47 UTC (rev 581)
@@ -466,6 +466,18 @@
   This wraps gd_nframes(3).  It takes the dirfile unit number as input and
   returns the number of frames in the dirfile in nframes.
 
+* GDECNT(error_count, dirfile_unit)
+
+  Output:
+    INTEGER error_count
+  Input:
+    INTEGER dirfile_unit
+
+  This subroutine wraps gd_error_count(3).  It takes the dirfile unit number as
+  input and returns the number of errors encountered by GetData since the last
+  call to this subroutine (or since the dirfile was first opened) in
+  error_count.
+
 * GDEROR(error, dirfile_unit)
 
   Output:
@@ -473,9 +485,9 @@
   Input:
     INTEGER dirfile_unit
 
-  This subroutine takes a dirfile unit as input and returns the DIRFILE.error
-  value associated with it in error.  The value of error will equal one of the
-  error codes defined in getdata.f.
+  This subroutine wraps gd_error(3).  It takes the dirfile unit number as input
+  and returns the error value arising from the last library call in error.  The
+  value of error will equal one of the error codes defined in getdata.f.
 
 * GDESTR(dirfile_unit, buffer, buffer_len)
 

Modified: trunk/getdata/doc/README.f95
===================================================================
--- trunk/getdata/doc/README.f95	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/doc/README.f95	2011-04-20 22:42:47 UTC (rev 581)
@@ -107,6 +107,12 @@
   integer, intent(in) :: dirfile
   character (len=*), intent(in) :: field_code
 
+* integer function fgd_error (dirfile_unit)
+  integer, intent(in) :: dirfile_unit
+ 
+* integer function fgd_error_count (dirfile_unit)
+  integer, intent(in) :: dirfile_unit
+ 
 * integer function fgd_error_string (dirfile, buffer, len)
   integer, intent(in) :: dirfile, len
   character (len=<len>), intent(out) :: buffer
@@ -656,11 +662,6 @@
   integer, intent(inout) :: field_len
   character (len=*), intent(in) :: parent
 
-* integer function fgd_error (dirfile_unit)
-  integer, intent(in) :: dirfile_unit
- 
-  This returns the DIRFILE error associated with the supplied dirfile unit.
-
 * integer function fgd_entry (dirfile_unit, field_code, ent)
   integer, intent(in) :: dirfile_unit
   character (len=*), intent(in) :: field_code

Modified: trunk/getdata/doc/README.idl
===================================================================
--- trunk/getdata/doc/README.idl	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/doc/README.idl	2011-04-20 22:42:47 UTC (rev 581)
@@ -81,19 +81,20 @@
 IDL supports all GetData data types with the exception of INT8.  Attempting to
 return data as INT8 will result in an error.
 
-Except for the functions GETDATA_CONSTANTS, GD_ERROR, GD_ERROR_STRING, and
-GD_INVALID_DIRFILE, all IDL GetData functions and procedures may take two
-optional keyword parameters which deal with error reporting:
+Except for the functions GETDATA_CONSTANTS, GD_ERROR, GD_ERROR_COUNT,
+GD_ERROR_STRING, and GD_INVALID_DIRFILE, all IDL GetData functions and
+procedures may take two optional keyword parameters which deal with error
+reporting:
 
   ERROR:   a variable in which the dirfile error number resulting from this
-           call will be stored.  It will be the !GD.E_* error codes
-           corresponding to the C API error code.  On success this will be
-           !GD.E_OK (= 0).  If this parameter is not specified, the dirfile
-           error can still be retrieved by calling GD_ERROR() after this call.
+           call will be stored.  It will be the !GD.E_* error code corresponding
+           to the C API error code.  On success this will be !GD.E_OK (= 0).  If
+           this parameter is not specified, the dirfile error can still be
+           retrieved by calling GD_ERROR() after this call.
   ESTRING: a variable in which the string representation of the error resulting
            from this call will be stored.  If this parameter is not specified,
            the the dirfile error string can still be retrieved by calling
-           GD_ERROR_STRING().
+           GD_ERROR_STRING() after the call.
 
 For brevity, these keyword parameters are omitted from the subroutine prototypes
 given below.
@@ -555,6 +556,13 @@
   This function does not take the normal ERROR and ESTRING keyword parameters.
   See gd_error(3).
 
+FUNCTION GD_ERROR_COUNT(dirfile_unit)
+
+  This function returns the number of errors encountered by the GetData library
+  on the specified dirfile since this function was last called (or since the
+  dirfile was opened, if this is the first call to this function).  See
+  gd_error_count(3).
+
 FUNCTION GD_ERROR_STRING(dirfile_unit)
 
   This function returns a human readable string describing the error status of

Modified: trunk/getdata/man/gd_error_count.3
===================================================================
--- trunk/getdata/man/gd_error_count.3	2011-04-19 22:51:58 UTC (rev 580)
+++ trunk/getdata/man/gd_error_count.3	2011-04-20 22:42:47 UTC (rev 581)
@@ -13,7 +13,7 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_error_count 3 "19 April 2011" "Version 0.8.0" "GETDATA"
+.TH gd_error_count 3 "20 April 2011" "Version 0.8.0" "GETDATA"
 .SH NAME
 gd_error_count \(em report the number of errors encountered by the GetData
 library
@@ -26,22 +26,18 @@
 .hy
 .ad n
 .SH DESCRIPTION
-The
-.BR gd_error_count ()
-function returns the number of errors encountered by the GetData library
-on the DIRFILE object
-.I dirfile
-since this function was last called on
-.IR dirfile .
 The first time
 .BR gd_error_count ()
-is called on the supplied
-.I dirfile
-object, the count is since
-.I dirfile
-was created.
+is called with the DIRFILE object
+.IR dirfile ,
+it returns the number of errors encountered by the GetData library while
+operating on the specified DIRFILE object, since the DIRFILE's creation.
+Calling this function resets the internal count, so that subsequent calls to
+.BR gd_error_count ()
+return the number of errors encountered only since the previous call to this
+function, for the specified DIRFILE.
 
-The
+The errors themselves are not cached by the library.  The
 .I last
 error encountered by the library for
 .I dirfile


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




Thread: [Getdata-commits] SF.net SVN: getdata:[581] trunk/getdata (Page 3)

Scientific Database Format

getdata-commits