gnue/geas/src/classdef classdef.c

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/12/14 17:59:53

Modified files:
        geas/src/classdef: classdef.c 

Log message:
        Temporary changes to make the new parser's table and field names 
compatible with the old parser's ones.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/classdef.c.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: gnue/geas/src/classdef/classdef.c
diff -c gnue/geas/src/classdef/classdef.c:1.26 
gnue/geas/src/classdef/classdef.c:1.27
*** gnue/geas/src/classdef/classdef.c:1.26      Thu Nov 29 15:56:56 2001
--- gnue/geas/src/classdef/classdef.c   Fri Dec 14 17:59:53 2001
***************
*** 19,25 ****
     along with GEAS; if not, write to the Free Software Foundation, Inc.,
     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!    $Id: classdef.c,v 1.26 2001/11/29 20:56:56 reinhard Exp $
  */
  
  #include "config.h"
--- 19,25 ----
     along with GEAS; if not, write to the Free Software Foundation, Inc.,
     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!    $Id: classdef.c,v 1.27 2001/12/14 22:59:53 reinhard Exp $
  */
  
  #include "config.h"
***************
*** 598,604 ****
                                    GEAS_CD_DATATYPE_ID);
            /* The shadow field db column starts with an underscore */
            shadow->name_db  = g_strconcat ("_", f->thisclass->name_db, "_",
!                                           f->name_db, NULL);
            /* FIXME: The above is for compatibility; this would be correct:
            shadow->name_db  = g_strconcat ("_", f->thisclass->name_db, "__",
                                            f->name_db, NULL); */
--- 598,604 ----
                                    GEAS_CD_DATATYPE_ID);
            /* The shadow field db column starts with an underscore */
            shadow->name_db  = g_strconcat ("_", f->thisclass->name_db, "_",
!                                           f->name, NULL);
            /* FIXME: The above is for compatibility; this would be correct:
            shadow->name_db  = g_strconcat ("_", f->thisclass->name_db, "__",
                                            f->name_db, NULL); */
***************
*** 655,661 ****
  
    f = _create_field (&(c->fields), c, m, g_strdup (name), type->datatype);
  
!   f->name_db    = g_strconcat (m->name, "__", name, NULL);
    f->type       = type;
    f->format     = type->format;
    f->otherclass = type->otherclass;
--- 655,670 ----
  
    f = _create_field (&(c->fields), c, m, g_strdup (name), type->datatype);
  
!   /* FIXME: for compatibility with old parser */
!   if (!strcmp (m->name, "geas"))
!     {
!       f->name_db    = g_strconcat ("sys_", name, NULL);
!     }
!   else
!     {
!       f->name_db    = g_strdup (name);
!       /* FIXME: f->name_db    = g_strconcat (m->name, "__", name, NULL); */
!     }
    f->type       = type;
    f->format     = type->format;
    f->otherclass = type->otherclass;
***************
*** 691,697 ****
    f = _create_field (&(c->fields), c, m, g_strdup (name),
                       GEAS_CD_DATATYPE_REFERENCE);
  
!   f->name_db    = g_strconcat (m->name, "__", name, NULL);
    f->otherclass = otherclass;
    f->thisfield  = thisfield;
    f->otherfield = otherfield;
--- 700,708 ----
    f = _create_field (&(c->fields), c, m, g_strdup (name),
                       GEAS_CD_DATATYPE_REFERENCE);
  
!   /* FIXME:
!   f->name_db    = g_strconcat (m->name, "__", name, NULL); */
!   f->name_db    = g_strdup (name);
    f->otherclass = otherclass;
    f->thisfield  = thisfield;
    f->otherfield = otherfield;