getdata-commits Mailing List for GetData (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 921
          http://sourceforge.net/p/getdata/code/921
Author:   ketiltrout
Date:     2014-07-30 20:00:59 +0000 (Wed, 30 Jul 2014)
Log Message:
-----------
Delete gd_delete_alias().

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/NEWS
    trunk/getdata/bindings/cxx/dirfile.cpp
    trunk/getdata/bindings/cxx/getdata/dirfile.h
    trunk/getdata/bindings/cxx/test/big_test.cpp
    trunk/getdata/bindings/f77/fgetdata.c
    trunk/getdata/bindings/f77/fgetdata.h
    trunk/getdata/bindings/f77/getdata.f90.in
    trunk/getdata/bindings/f77/test/big_test.f
    trunk/getdata/bindings/f77/test/big_test95.f90
    trunk/getdata/bindings/idl/getdata.c
    trunk/getdata/bindings/idl/test/big_test.pro
    trunk/getdata/bindings/matlab/Makefile.am
    trunk/getdata/bindings/matlab/test/big_test.m
    trunk/getdata/bindings/perl/simple_funcs.xsin
    trunk/getdata/bindings/perl/t/big_test.t
    trunk/getdata/bindings/php/getdata.c
    trunk/getdata/bindings/php/test/big_test.php
    trunk/getdata/bindings/python/pydirfile.c
    trunk/getdata/bindings/python/test/big_test.py
    trunk/getdata/doc/list.tests
    trunk/getdata/man/dirfile.5
    trunk/getdata/man/gd_delete.3
    trunk/getdata/src/del.c
    trunk/getdata/src/getdata.h.in
    trunk/getdata/test/del_alias.c

Removed Paths:
-------------
    trunk/getdata/bindings/matlab/gd_delete_alias.c

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

--- trunk/getdata/ChangeLog	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/ChangeLog	2014-07-30 20:00:59 UTC (rev 921)
@@ -1,3 +1,22 @@
+2014-07-30     D. V. Wiebe <g et...@ke...> svn:921
+	* src/del.c (gd_delete_alias): Deleted.
+	* src/del.c (gd_delete): Don't dereference the field code.
+
+	* bindings/f77/fgetdata.c (GDDELA) bindings/f77/getdata.f90.in
+	(fgd_delete_alias) bindings/cxx/dirfile.cpp (Dirfile::DeleteAlias)
+	bindings/php/getdata.c (gd_delete_alias) bindings/python/pydirfile.c
+	(gdpy_dirfile_deletealias): Deleted.
+	* bindings/matlab/gd_delete_alias.c: Deleted.
+	* bindings/perl/simple_funcs.xsin: Deleted delete_alias.
+	* bindings/idl/getdata.c (gdidl_delete): Removed the /ALIAS keyword.
+
+	* bindings/cxx/test/big_test.cpp bindings/f77/test/big_test.f
+	bindings/f77/test/big_test95.f90 bindings/idl/test/big_test.pro
+	bindings/matlab/test/big_test.m bindings/perl/t/big_test.t
+	bindings/php/test/big_test.php bindings/python/test/big_test.py: Deleted
+	test 225.
+
+
 2014-07-25     D. V. Wiebe <g et...@ke...> svn:915
 	* Makefile.am: Auotmake version bumped to 1.13.
 	* configure.ac: Autoconf version bumped to 2.65.

Modified: trunk/getdata/NEWS
===================================================================
--- trunk/getdata/NEWS	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/NEWS	2014-07-30 20:00:59 UTC (rev 921)
@@ -187,9 +187,10 @@
     which accepts the GD_REN_* flags, which have the same meaning as they do
     with gd_rename().
 
-  * gd_move_alias() has been deleted: its function is now performed by
-    gd_move().  If gd_move() is passed the field code of an alias, the alias is
-    now moved, instead of moving the field the alias points to.
+  * gd_move_alias() and gd_delete_alias() have been deleted: their functions are
+    now performed by gd_move() and gd_delete(), which now operate on the alias
+    itself when given the field code to an alias, rather than the field the alias
+    points to.
 
   * gd_encoding_support() has been added to permit run-time determination of
     supported encodings.
@@ -262,7 +263,7 @@
     general, most people building GetData from a source release don't need the
     tools to build GetData; the autotools are only needed if changes need to be
     made to the configure script or Makefile input files provided in the
-    release.
+    release or if building from the repository.
 
 |==============================================================================|
 

Modified: trunk/getdata/bindings/cxx/dirfile.cpp
===================================================================
--- trunk/getdata/bindings/cxx/dirfile.cpp	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/cxx/dirfile.cpp	2014-07-30 20:00:59 UTC (rev 921)
@@ -494,11 +494,6 @@
   return gd_alias_target(D, field_code);
 }
 
-int Dirfile::DeleteAlias(const char* field_code, int flags) const
-{
-  return gd_delete_alias(D, field_code, flags);
-}
-
 int Dirfile::Hide(const char* field_code) const
 {
   return gd_hide(D, field_code);

Modified: trunk/getdata/bindings/cxx/getdata/dirfile.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/dirfile.h	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/cxx/getdata/dirfile.h	2014-07-30 20:00:59 UTC (rev 921)
@@ -129,8 +129,6 @@
 
       int Delete(const char* field_code, int flags = 0) const;
 
-      int DeleteAlias(const char* field_code, int flags = 0) const;
-
       int DeSync(unsigned int flags = 0);
 
       int Discard();

Modified: trunk/getdata/bindings/cxx/test/big_test.cpp
===================================================================
--- trunk/getdata/bindings/cxx/test/big_test.cpp	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/cxx/test/big_test.cpp	2014-07-30 20:00:59 UTC (rev 921)
@@ -1587,14 +1587,6 @@
   d->IncludeAffix("format1", 0, "A", "Z", GD_CREAT | GD_EXCL);
   CHECK_OK(223);
 
-  // 225: gd_delete_alias check
-  d->DeleteAlias("new20", 0);
-  CHECK_OK2(225, 1);
-
-  n = d->FragmentIndex("new20");
-  CHECK_ERROR2(225, 2, GD_E_BAD_CODE);
-  CHECK_INT(225, n, -1);
-
   // 226: gd_fragment_affixes check
   frag = d->Fragment(1);
 

Modified: trunk/getdata/bindings/f77/fgetdata.c
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/f77/fgetdata.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -3963,21 +3963,6 @@
   dreturnvoid();
 }
 
-/* gd_delete_alias */
-void F77_FUNC(gddela, GDDELA) (const int32_t *dirfile, const char *field_code,
-    const int32_t *field_code_l, const int32_t *flags)
-{
-  char *fc;
-
-  dtrace("%i, %p, %i, %i", *dirfile, field_code, *field_code_l, *flags);
-
-  gd_delete_alias(_GDF_GetDirfile(*dirfile), _GDF_CString(&fc, field_code,
-        *field_code_l), (unsigned int)*flags);
-
-  free(fc);
-  dreturnvoid();
-}
-
 /* gd_fragment_affixes */
 void F77_FUNC(gdfraf, GDFRAF) (char *prefix, int32_t *prefix_l, char *suffix,
     int32_t *suffix_l, const int32_t *dirfile, const int32_t *index)

Modified: trunk/getdata/bindings/f77/fgetdata.h
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.h	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/f77/fgetdata.h	2014-07-30 20:00:59 UTC (rev 921)
@@ -679,9 +679,6 @@
 void F77_FUNC(gdfraf, GDFRAF) (char *prefix, int32_t *prefix_l, char *suffix,
     int32_t *suffix_l, const int32_t *dirfile, const int32_t *index);
 
-void F77_FUNC(gddela, GDDELA) (const int32_t *dirfile, const char *field_code,
-    const int32_t *field_code_l, const int32_t *flags);
-
 void F77_FUNC(gdaafx, GDAAFX) (const int32_t *dirfile, const int32_t *index,
     const char *prefix, const int32_t *prefix_l, const char *suffix,
     const int32_t *suffix_l);

Modified: trunk/getdata/bindings/f77/getdata.f90.in
===================================================================
--- trunk/getdata/bindings/f77/getdata.f90.in	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/f77/getdata.f90.in	2014-07-30 20:00:59 UTC (rev 921)
@@ -2873,13 +2873,6 @@
   end if
 end subroutine
 
-subroutine fgd_delete_alias (dirfile, field_code, flags)
-  integer, intent(in) :: dirfile, flags
-  character (len=*), intent(in) :: field_code
-
-  call gddela(dirfile, TRIM(field_code), LEN_TRIM(field_code), flags)
-end subroutine
-
 function fgd_hidden (dirfile, field_code)
   integer :: fgd_hidden
   integer, intent(in) :: dirfile

Modified: trunk/getdata/bindings/f77/test/big_test.f
===================================================================
--- trunk/getdata/bindings/f77/test/big_test.f	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/f77/test/big_test.f	2014-07-30 20:00:59 UTC (rev 921)
@@ -2000,14 +2000,6 @@
       CALL GDINCA(d, 'format1', 7, 0, 'A', 1, 'Z', 1, GD_CR + GD_EX)
       CALL CHKEOK(ne, 223, d)
 
-C     225: GDDELA check
-      CALL GDDELA(d, 'new20', 7, 0)
-      CALL CHKOK2(ne, 225, 1, d)
-
-      CALL GDFRGI(n, d, 'new20', 7)
-      CALL CHKER2(ne, 225, 2, d, GD_EBC)
-      CALL CHKINT(ne, 225, n, -1)
-
 C     226: GDFRAF check
       l = flen
       n = flen

Modified: trunk/getdata/bindings/f77/test/big_test95.f90
===================================================================
--- trunk/getdata/bindings/f77/test/big_test95.f90	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/f77/test/big_test95.f90	2014-07-30 20:00:59 UTC (rev 921)
@@ -2406,14 +2406,6 @@
   call fgd_include_affix(d, 'format1', 0, 'A', 'Z', GD_CREAT + GD_EXCL)
   call check_ok(ne, 223, d)
 
-! 225: fgd_delete_alias check
-  call fgd_delete_alias(d, 'new20', 0)
-  call check_ok2(ne, 225, 1, d)
-
-  n = fgd_fragment_index(d, 'new20')
-  call check_err2(ne, 225, 2, d, GD_E_BAD_CODE)
-  call check_int(ne, 225, n, -1)
-
 ! 226: fgd_fragment_affixes check
   l = flen
   n = flen

Modified: trunk/getdata/bindings/idl/getdata.c
===================================================================
--- trunk/getdata/bindings/idl/getdata.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/idl/getdata.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -3057,18 +3057,16 @@
   typedef struct {
     IDL_KW_RESULT_FIRST_FIELD;
     GDIDL_KW_RESULT_ERROR;
-    int alias;
     int data;
     int deref;
     int force;
   } KW_RESULT;
   KW_RESULT kw;
 
-  kw.alias = kw.data = kw.deref = kw.force = 0;
+  kw.data = kw.deref = kw.force = 0;
   GDIDL_KW_INIT_ERROR;
 
   static IDL_KW_PAR kw_pars[] = {
-    { "ALIAS", IDL_TYP_INT, 1, 0, 0, IDL_KW_OFFSETOF(alias) },
     { "DEL_DATA", IDL_TYP_INT, 1, 0, 0, IDL_KW_OFFSETOF(data) },
     { "DEREF", IDL_TYP_INT, 1, 0, 0, IDL_KW_OFFSETOF(deref) },
     GDIDL_KW_PAR_ERROR,
@@ -3082,12 +3080,8 @@
   DIRFILE* D = gdidl_get_dirfile(IDL_LongScalar(argv[0]));
   const char* field_code = IDL_VarGetString(argv[1]);
 
-  if (kw.alias)
-    gd_delete_alias(D, field_code, (kw.deref ? GD_DEL_DEREF : 0) | 
-        (kw.force) ? GD_DEL_FORCE : 0);
-  else
-    gd_delete(D, field_code, (kw.data ? GD_DEL_DATA : 0) |
-        (kw.deref ? GD_DEL_DEREF : 0) | (kw.force) ? GD_DEL_FORCE : 0);
+  gd_delete(D, field_code, (kw.data ? GD_DEL_DATA : 0) |
+      (kw.deref ? GD_DEL_DEREF : 0) | (kw.force) ? GD_DEL_FORCE : 0);
 
   GDIDL_SET_ERROR(D);
 

Modified: trunk/getdata/bindings/idl/test/big_test.pro
===================================================================
--- trunk/getdata/bindings/idl/test/big_test.pro	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/idl/test/big_test.pro	2014-07-30 20:00:59 UTC (rev 921)
@@ -1263,14 +1263,6 @@
 gd_include, d, 'format1', prefix='A', suffix='Z', /CREAT, /EXCL
 nume += check_ok(223, d)
 
-; 225: gd_delete_alias check
-gd_delete, d, 'new20', /ALIAS
-nume += check_ok2(225, 1, d)
-
-n = gd_fragment_index(d, 'new20')
-nume += check_error2(225, 2, d, !GD.E_BAD_CODE)
-nume += check_simple(225, n, -1)
-
 ; 226: gd_fragment_affixes check
 n = gd_fragment_affixes(d, fragment=1)
 nume += check_ok(226, d)

Modified: trunk/getdata/bindings/matlab/Makefile.am
===================================================================
--- trunk/getdata/bindings/matlab/Makefile.am	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/matlab/Makefile.am	2014-07-30 20:00:59 UTC (rev 921)
@@ -51,7 +51,7 @@
 				 gd_alter_encoding gd_alter_endianness gd_alter_entry \
 				 gd_alter_frameoffset \
 				 gd_alter_protection gd_alter_spec gd_bof gd_array_len gd_carrays \
-				 gd_close gd_constants gd_delete gd_delete_alias gd_desync \
+				 gd_close gd_constants gd_delete gd_desync \
 				 gd_dirfilename gd_dirfile_standards \
 				 gd_discard gd_encoding gd_encoding_support gd_endianness \
 				 gd_entry gd_entry_list gd_entry_type gd_eof \

Deleted: trunk/getdata/bindings/matlab/gd_delete_alias.c
===================================================================
--- trunk/getdata/bindings/matlab/gd_delete_alias.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/matlab/gd_delete_alias.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -1,57 +0,0 @@
-/* Copyright (C) 2013 D. V. Wiebe
- *
- ***************************************************************************
- *
- * This file is part of the GetData project.
- *
- * GetData is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- *
- * GetData is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with GetData; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include "gd_matlab.h"
-
-/*
- % GD_DELETE_ALIAS  Delete an alias from a dirfile
- %
- %   GD_DELETE_ALIAS(DIRFILE,NAME[,FLAGS])
- %             deletes the alias called NAME from the dirfile DIRFILE.  If
- %             given, FLAGS should be a bitwise or'd collection of zero or more
- %             of the GD.DEL_... flags provided by GETDATA_CONSTANTS.
- %
- %   The DIRFILE object should have previously been created with GD_OPEN.
- %
- %   See the documentation on the C API function gd_delete_alias(3) in
- %   section 3 of the UNIX manual for more details.
- %
- %   See also GD_DELETE, GD_OPEN, GETDATA_CONSTANTS
- */
-
-void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
-{
-  DIRFILE *D;
-  char *field_code;
-  unsigned int flags = 0;
-
-  GDMX_NO_LHS;
-  GDMX_CHECK_RHS2(2, 3);
-
-  D = gdmx_to_dirfile(prhs[0]);
-  field_code = gdmx_to_string(prhs, 1, 0);
-  if (nrhs > 2)
-    flags = gdmx_to_uint(prhs, 2);
-
-  gd_delete_alias(D, field_code, flags);
-
-  mxFree(field_code);
-  gdmx_err(D, 0);
-}

Modified: trunk/getdata/bindings/matlab/test/big_test.m
===================================================================
--- trunk/getdata/bindings/matlab/test/big_test.m	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/matlab/test/big_test.m	2014-07-30 20:00:59 UTC (rev 921)
@@ -1815,19 +1815,6 @@
     ne = ne + check_ok2(exc, 41, 1);
   end
 
-  % 225: delete_alias
-  try
-    gd_delete_alias(D, 'new20');
-  catch exc
-    ne = ne + check_ok2(exc, 225, 1);
-  end
-
-  try
-    d = gd_fragment_index(D, 'new20');
-  catch exc
-    ne = ne + check_exc2(exc, 225, 2, 'BadCode');
-  end
-
   % 226: fragment_affixes
   try
     d = gd_fragment_affixes(D, 1);

Modified: trunk/getdata/bindings/perl/simple_funcs.xsin
===================================================================
--- trunk/getdata/bindings/perl/simple_funcs.xsin	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/perl/simple_funcs.xsin	2014-07-30 20:00:59 UTC (rev 921)
@@ -123,7 +123,6 @@
 int hidden(DIRFILE *dirfile, const char *field_code)
 int unhide(DIRFILE *dirfile, const char *field_code)
 int sync(DIRFILE *dirfile, const char *field_code)
-int delete_alias(DIRFILE *dirfile, const char *field_code, unsigned int flags=0)
 const char *alias_target(DIRFILE *dirfile, const char *field_code)
 int add_alias(DIRFILE *dirfile, const char *field_code, const char *target,
     int fragment_index=0)

Modified: trunk/getdata/bindings/perl/t/big_test.t
===================================================================
--- trunk/getdata/bindings/perl/t/big_test.t	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/perl/t/big_test.t	2014-07-30 20:00:59 UTC (rev 921)
@@ -22,7 +22,7 @@
 use GetData;
 use Math::Complex;
 use strict;
-use Test::More tests => 1729;
+use Test::More tests => 1727;
 
 my $ne = 0;
 my ($s, @a, %h);
@@ -1605,13 +1605,6 @@
 $s = $_->include('format1', 0, $GetData::CREAT | $GetData::EXCL, 'A', 'Z');
 CheckOK(223);
 
-# 225: gd_delete_alias check
-$s = $_->delete_alias('new20', 0);
-CheckOK2(225, 1);
-
-$_->fragment_index('new20');
-CheckError2(225, 2, $GetData::E_BAD_CODE);
-
 # 226: gd_fragment_affixes check
 @a = $_->fragment_affixes(1);
 CheckOK(226);

Modified: trunk/getdata/bindings/php/getdata.c
===================================================================
--- trunk/getdata/bindings/php/getdata.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/php/getdata.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -3005,21 +3005,6 @@
   GDPHP_RETURN_BOOL(gd_delete(D, field_code, flags));
 }
 
-PHP_FUNCTION(gd_delete_alias)
-{
-  char *field_code;
-  int field_code_len;
-  long flags = 0;
-
-  DIRFILE *D;
-
-  dtracephp();
-
-  GDPHP_PARSED("s|l", &field_code, &field_code_len, &flags);
-
-  GDPHP_RETURN_BOOL(gd_delete_alias(D, field_code, flags));
-}
-
 PHP_FUNCTION(gd_desync)
 {
   long flags = 0;
@@ -5176,7 +5161,6 @@
     PHP_FE(gd_close, NULL)
     PHP_FE(gd_constants, NULL)
     PHP_FE(gd_delete, NULL)
-    PHP_FE(gd_delete_alias, NULL)
     PHP_FE(gd_desync, NULL)
     PHP_FE(gd_dirfile_standards, NULL)
     PHP_FE(gd_dirfilekey, NULL)

Modified: trunk/getdata/bindings/php/test/big_test.php
===================================================================
--- trunk/getdata/bindings/php/test/big_test.php	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/php/test/big_test.php	2014-07-30 20:00:59 UTC (rev 921)
@@ -1362,15 +1362,6 @@
 check_ok2(223, 0, $D);
 check_var2(223, 1, $v, 1);
 
-# 225: delete alias
-$v = gd_delete_alias($D, 'new20');
-check_ok2(225, 0, $D);
-check_var2(225, 1, $v, TRUE);
-
-$v = gd_fragment_index($D, 'new20');
-check_error2(225, 2, $D, GD_E_BAD_CODE);
-check_var2(225, 3, $v, FALSE);
-
 # 226: fragment affixes
 $v = gd_fragment_affixes($D, 1);
 check_ok(226, $D);

Modified: trunk/getdata/bindings/python/pydirfile.c
===================================================================
--- trunk/getdata/bindings/python/pydirfile.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/python/pydirfile.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -2630,31 +2630,6 @@
   return pyobj;
 }
 
-static PyObject *gdpy_dirfile_deletealias(struct gdpy_dirfile_t *self,
-    void *args, void *keys)
-{
-  char *keywords[] = {"field_code", "flags", NULL};
-  const char *field_code;
-  unsigned flags = 0;
-
-  dtrace("%p, %p, %p", self, args, keys);
-
-  if (!PyArg_ParseTupleAndKeywords(args, keys,
-        "s|I:pygetdata.dirfile.delete", keywords, &field_code, &flags))
-  {
-    dreturn("%p", NULL);
-    return NULL;
-  }
-
-  gd_delete_alias(self->D, field_code, flags);
-
-  PYGD_CHECK_ERROR(self->D, NULL);
-
-  Py_INCREF(Py_None);
-  dreturn("%p", Py_None);
-  return Py_None;
-}
-
 static PyObject *gdpy_dirfile_aliaslist(struct gdpy_dirfile_t *self,
     void *args, void *keys)
 {
@@ -3606,15 +3581,6 @@
       "field.  If field_code is valid, this will be at least one.  See\n"
       "gd_naliases(3)."
   },
-  {"delete_alias", (PyCFunction)gdpy_dirfile_deletealias,
-    METH_VARARGS | METH_KEYWORDS,
-    "delete_alias(field_code[, flags])\n\n"
-      "Delete the alias 'field_code' from the database.  If 'flags' is\n"
-      "omitted, it is assumed to be zero.  Otherwise, 'flags' should be a\n"
-      "bitwise or'd collection of the pygetdata.DEL_* symbols, whose\n"
-      "meanings are described in the gd_delete manual page.  See\n"
-      "gd_delete_alias(3)."
-  },
   {"alias_target", (PyCFunction)gdpy_dirfile_aliastarget,
     METH_VARARGS | METH_KEYWORDS,
     "alias_target(field_code)\n\n"

Modified: trunk/getdata/bindings/python/test/big_test.py
===================================================================
--- trunk/getdata/bindings/python/test/big_test.py	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/bindings/python/test/big_test.py	2014-07-30 20:00:59 UTC (rev 921)
@@ -1798,17 +1798,6 @@
 except:
   CheckOK(223)
 
-# 225: gd_delete_alias check
-try:
-  d.delete_alias('new20', 0)
-except:
-  CheckOK2(225, 1)
-
-try:
-  n = d.fragment_index('new20')
-except:
-  CheckException2(255, 2, pygetdata.BadCodeError)
-
 # 226: gd_fragment_affixes check
 try:
   n = d.fragment(1).prefix

Modified: trunk/getdata/doc/list.tests
===================================================================
--- trunk/getdata/doc/list.tests	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/doc/list.tests	2014-07-30 20:00:59 UTC (rev 921)
@@ -223,7 +223,7 @@
 222 F9CIpPmh gd_aliases
 223 F9CIpPmh gd_include_affix
 224 ........ (unused)
-225 F9CIpPmh gd_delete_alias
+225 ........ (unused)
 226 F9CIpPmh gd_fragment_affixes
 227 F9CIpPmh gd_alter_affixes
 228 F9CIpPmh gd_entry (MPLEX)

Modified: trunk/getdata/man/dirfile.5
===================================================================
--- trunk/getdata/man/dirfile.5	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/man/dirfile.5	2014-07-30 20:00:59 UTC (rev 921)
@@ -115,7 +115,7 @@
 
 To aid in using complex valued data, dirfile field codes may contain a
 .I representation suffix
-which specifies a norm to apply to the complex valued data to convert it into
+which specifies a function to apply to the complex valued data to map it into
 purely real data.  See
 .BR dirfile\-format (5).
 

Modified: trunk/getdata/man/gd_delete.3
===================================================================
--- trunk/getdata/man/gd_delete.3	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/man/gd_delete.3	2014-07-30 20:00:59 UTC (rev 921)
@@ -13,9 +13,9 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_delete 3 "1 January 2012" "Version 0.8.0" "GETDATA"
+.TH gd_delete 3 "30 July 2014" "Version 0.9.0" "GETDATA"
 .SH NAME
-gd_delete, gd_delete_alias \(em remove an entry from a dirfile
+gd_delete \(em remove an entry from a dirfile
 .SH SYNOPSIS
 .B #include <getdata.h>
 .HP
@@ -23,15 +23,12 @@
 .ad l
 .BI "int gd_delete(DIRFILE *" dirfile ", const char *" field_code ,
 .BI "unsigned int " flags );
-.HP
-.BI "int gd_delete_alias(DIRFILE *" dirfile ", const char *" alias_name ,
-.BI "unsigned int " flags );
 .hy
 .ad n
 .SH DESCRIPTION
 The
 .BR gd_delete ()
-function attempts to delete the field specified by
+function attempts to delete the field or alias specified by
 .I field_code
 in the dirfile specified by
 .IR dirfile .
@@ -40,18 +37,6 @@
 should not contain a representation suffix.
 
 The
-.BR gd_delete_alias ()
-function behaves similarly, but deletes the alias specified by
-.I alias_name
-instead.  (This function is needed, since passing
-.I alias_name
-to
-.BR gd_delete ()
-as
-.I field_code
-would have resulted in the field pointed to by the alias being deleted instead.)
-
-The
 .I flags
 argument influences how the deletion attempt occurs.  It may be zero, for the
 default behaviour, or else one or more of the following flags, bitwise or'd
@@ -65,8 +50,7 @@
 specified a
 .B RAW
 field and this flag is not specified, the field will still be deleted but the
-binary file will be left untouched.  Ignored by
-.BR gd_delete_alias ().
+binary file will be left untouched.
 .TP
 .B GD_DEL_DEREF
 If the field to be deleted is a
@@ -88,8 +72,7 @@
 those, too.  If the field has metafields and this flag is not specified, the
 call will fail with the
 .B GD_E_DELETE
-error.  Ignored by
-.BR gd_delete_alias ().
+error.
 .SH RETURN VALUE
 On successful deletion, zero is returned.  On error, -1 is returned and the
 dirfile error is set to a non-zero error value.  Possible error values are:

Modified: trunk/getdata/src/del.c
===================================================================
--- trunk/getdata/src/del.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/src/del.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -73,15 +73,15 @@
     case GD_CONST_ENTRY:
     case GD_CARRAY_ENTRY:
     case GD_STRING_ENTRY:
+    case GD_SARRAY_ENTRY:
       break;
-    default:
-      if (E->field_type == GD_ALIAS_ENTRY)
-        if (E->e->entry[0] == C) {
-          if (check)
-            _GD_SetError(D, GD_E_DELETE, GD_E_DEL_ALIAS, E->field, 0, C->field);
-          else
-            E->e->entry[0] = NULL;
-        }
+    case GD_ALIAS_ENTRY:
+      if (E->e->entry[0] == C) {
+        if (check)
+          _GD_SetError(D, GD_E_DELETE, GD_E_DEL_ALIAS, E->field, 0, C->field);
+        else
+          E->e->entry[0] = NULL;
+      }
   }
 
   dreturnvoid();
@@ -305,7 +305,7 @@
   for (i = 0; i < E->e->n_meta; ++i)
     del_list[n_del++] = E->e->p.meta_entry[i];
 
-  /* Check for clients and derived fields */
+  /* Check for clients, derived fields, and inbound aliases */
   if (~flags & GD_DEL_FORCE)
     for (j = 0; j < D->n_entries; ++j)
       for (i = 0; i < n_del; ++i) {
@@ -496,50 +496,15 @@
   return 0;
 }
 
-int gd_delete(DIRFILE *D, const char *field_code_in, unsigned int flags)
+int gd_delete(DIRFILE *D, const char *field_code, unsigned int flags)
 {
   unsigned index;
-  int repr, ret;
-  char *field_code;
-  gd_entry_t *E;
-
-  dtrace("%p, \"%s\", 0x%X", D, field_code_in, flags);
-
-  if (D->flags & GD_INVALID) {/* don't crash */
-    _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
-    dreturn("%i", -1);
-    return -1;
-  }
-
-  _GD_ClearError(D);
-
-  E = _GD_FindFieldAndRepr(D, field_code_in, &field_code, &repr, &index, 1, 1);
-
-  if (field_code != field_code_in)
-    free(field_code);
-
-  if (D->error) {
-    dreturn("%i", -1);
-    return -1;
-  }
-
-  ret = _GD_Delete(D, E, index, flags);
-
-  dreturn("%i", ret);
-  return ret;
-}
-
-
-int gd_delete_alias(DIRFILE *D, const char *field_code, unsigned int flags)
-  gd_nothrow
-{
-  unsigned index;
   int ret;
   gd_entry_t *E;
 
   dtrace("%p, \"%s\", 0x%X", D, field_code, flags);
 
-  if (D->flags & GD_INVALID) {
+  if (D->flags & GD_INVALID) {/* don't crash */
     _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
     dreturn("%i", -1);
     return -1;
@@ -549,18 +514,11 @@
 
   E = _GD_FindField(D, field_code, D->entry, D->n_entries, 0, &index);
 
-  if (!E) {
-    _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
+  if (D->error) {
     dreturn("%i", -1);
     return -1;
   }
 
-  if (E->field_type != GD_ALIAS_ENTRY) {
-    _GD_SetError(D, GD_E_BAD_FIELD_TYPE, GD_E_FIELD_BAD, NULL, 0, field_code);
-    dreturn("%i", -1);
-    return -1;
-  }
-
   ret = _GD_Delete(D, E, index, flags);
 
   dreturn("%i", ret);

Modified: trunk/getdata/src/getdata.h.in
===================================================================
--- trunk/getdata/src/getdata.h.in	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/src/getdata.h.in	2014-07-30 20:00:59 UTC (rev 921)
@@ -683,9 +683,6 @@
 extern size_t gd_carray_len(DIRFILE *dirfile, const char *field_code) gd_nothrow
 gd_nonnull((1,2)) gd_deprecated;
 
-extern int gd_delete_alias(DIRFILE *dirfile, const char *field_code,
-    unsigned int flags) gd_nothrow gd_nonnull ((1,2));
-
 extern int gd_get_carray(DIRFILE *dirfile, const char *field_code,
     gd_type_t return_type, void *data_out) gd_nothrow gd_nonnull((1,2));
 

Modified: trunk/getdata/test/del_alias.c
===================================================================
--- trunk/getdata/test/del_alias.c	2014-07-30 01:50:28 UTC (rev 920)
+++ trunk/getdata/test/del_alias.c	2014-07-30 20:00:59 UTC (rev 921)
@@ -49,7 +49,7 @@
   D = gd_open(filedir, GD_RDWR);
   t1 = gd_entry_type(D, "alias");
   error1 = gd_error(D);
-  ret = gd_delete_alias(D, "alias", 0);
+  ret = gd_delete(D, "alias", 0);
   error2 = gd_error(D);
   t2 = gd_entry_type(D, "alias");
   error3 = gd_error(D);

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





2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (5)	Oct (20)	Nov (21)	Dec (16)
2011	Jan (1)	Feb (1)	Mar (56)	Apr (20)	May (4)	Jun (2)	Jul (3)	Aug (11)	Sep (2)	Oct (4)	Nov (18)	Dec (16)
2012	Jan (8)	Feb (12)	Mar (30)	Apr (13)	May (10)	Jun (17)	Jul (18)	Aug (19)	Sep	Oct (1)	Nov (1)	Dec (9)
2013	Jan (1)	Feb (4)	Mar (27)	Apr (6)	May (3)	Jun (1)	Jul (10)	Aug	Sep (3)	Oct (15)	Nov (4)	Dec (9)
2014	Jan	Feb (3)	Mar (4)	Apr (10)	May (15)	Jun	Jul (14)	Aug	Sep (2)	Oct (6)	Nov	Dec (9)
2015	Jan (2)	Feb (3)	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

getdata-commits Mailing List for GetData (Page 2)

Scientific Database Format

getdata-commits — An automated log of GetData Subversion activity.