Menu
▾
▴
[Ceps-cvs] sddb/sddbd/database/table-definition Makefile.am,1.1.4.2.2.3,1.1.4.2.2.4 type-definition.c,1.1.4.3.2.3,1.1.4.3.2.4 value.c,1.1.2.5,1.1.2.6
|
From: <bo...@pr...> - 2004-01-31 10:39:34
|
Update of /cvsroot/ceps/sddb/sddbd/database/table-definition In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1789/sddbd/database/table-definition Modified Files: Tag: v2-1029-5 Makefile.am type-definition.c value.c Log Message: checkpoint before weekend work-stop; everything compiles. Index: Makefile.am =================================================================== RCS file: /cvsroot/ceps/sddb/sddbd/database/table-definition/Attic/Makefile.am,v retrieving revision 1.1.4.2.2.3 retrieving revision 1.1.4.2.2.4 diff -C2 -d -r1.1.4.2.2.3 -r1.1.4.2.2.4 *** Makefile.am 28 Jan 2004 06:35:20 -0000 1.1.4.2.2.3 --- Makefile.am 31 Jan 2004 10:37:22 -0000 1.1.4.2.2.4 *************** *** 12,16 **** lib_table_definition_la_LADD = $(LDADD) ! lib_table_definition_la_SOURCES = type-definition.c field-definition.c index-definition.c table-definition.c lib_primitives_la_LADD = $(LDADD) ../types/lib-types.la --- 12,17 ---- lib_table_definition_la_LADD = $(LDADD) ! lib_table_definition_la_SOURCES = type-definition.c value.c vector.c function.c \ ! table-definition.c field-definition.c index-definition.c lib_primitives_la_LADD = $(LDADD) ../types/lib-types.la *************** *** 22,27 **** ## $Log$ ! ## Revision 1.1.4.2.2.3 2004/01/28 06:35:20 bozzio ! ## completed implementation of functions, alpha. ## ## Revision 1.1.4.2 2003/12/05 08:53:18 bozzio --- 23,28 ---- ## $Log$ ! ## Revision 1.1.4.2.2.4 2004/01/31 10:37:22 bozzio ! ## checkpoint before weekend work-stop; everything compiles. ## ## Revision 1.1.4.2 2003/12/05 08:53:18 bozzio Index: type-definition.c =================================================================== RCS file: /cvsroot/ceps/sddb/sddbd/database/table-definition/Attic/type-definition.c,v retrieving revision 1.1.4.3.2.3 retrieving revision 1.1.4.3.2.4 diff -C2 -d -r1.1.4.3.2.3 -r1.1.4.3.2.4 *** type-definition.c 30 Jan 2004 07:27:44 -0000 1.1.4.3.2.3 --- type-definition.c 31 Jan 2004 10:37:22 -0000 1.1.4.3.2.4 *************** *** 27,34 **** compareValues compareFunc, stringifyValue stringifyFunc, ! convertString convertFunc ! //convertString convertFunc, ! //validateValue validateFunc) ! ) { static char* fn= "typeDef_define"; --- 27,31 ---- compareValues compareFunc, stringifyValue stringifyFunc, ! convertString convertFunc) { static char* fn= "typeDef_define"; *************** *** 37,81 **** SddbReport( 25, "%s():", fn); ! td= typeDef_new( name, description, 0, newValueFunc, freeValueFunc, sizeofFunc, setFunc, compareFunc, stringifyFunc, convertFunc); ! //// these arguments are required: name, sizeofFunc, setFunc, compareFunc, stringifyFunc, convertFunc ! //if ( ! ( name && sizeofFunc && setFunc && compareFunc && stringifyFunc && convertFunc )) ! // td= NULL; ! //// check that the type is not defined yet. ! //else if ( typeDef_get(name) ) ! // td= NULL; ! //else ! //{ ! // td= (typeDef_t)calloc(1,sizeof(struct typeDef_t)); ! // td->magic= magic_typeDef; ! // td->name= strdup(name); ! // if ( description ) ! // td->description= strdup(description); ! // td->new= newValueFunc; ! // td->free= freeValueFunc ? freeValueFunc : free; ! // td->size= sizeofFunc; ! // td->set= setFunc; ! // td->compare= compareFunc; ! // td->stringify= stringifyFunc; ! // td->convert= convertFunc; ! // ! // //td->length= length; ! // td->len= 0; ! // td->valSize= typeDef_sizeof(td); ! // ! // //{ ! // // u_int sz2= typeDef_sizeof(td); ! // // td->sz= sz2; ! // // td->valSize= sz2 + sizeof(struct value_t); ! // //} ! // ! // // typeDef_add(td); ! // { ! // u_int n= (typeDefs.cur)++; ! // typeDefs.defs[n]= td; ! // td->a= n; ! // ! // SddbReport( 25, "%s(): td => %p, n => %u,", fn, td, n); ! // } ! //} SddbReport( 25, "%s(): td => %p,", fn, td); --- 34,38 ---- SddbReport( 25, "%s():", fn); ! td= typeDef_new( name, description, 0, newValueFunc, freeValueFunc, sizeofFunc, setFunc, compareFunc, stringifyFunc, convertFunc, NULL, NULL); SddbReport( 25, "%s(): td => %p,", fn, td); *************** *** 95,101 **** compareValues compareFunc, stringifyValue stringifyFunc, ! convertString convertFunc ! //convertString convertFunc, ! //validateValue validateFunc) ) { --- 52,59 ---- compareValues compareFunc, stringifyValue stringifyFunc, ! //convertString convertFunc ! convertString convertFunc, ! validateValue validateFunc, ! void* vdata ) { *************** *** 118,160 **** compareFunc ? compareFunc : td0->compare, stringifyFunc ? stringifyFunc : td0->stringify, ! convertFunc ? convertFunc : td0->convert); if ( td ) td->base= td0; } - //{ - // td= (typeDef_t)calloc(1,sizeof(struct typeDef_t)); - // td->magic= magic_typeDef; - // td->name= strdup(name); - // if ( description ) - // td->description= strdup(description); - // td->new= newValueFunc ? newValueFunc : td0->new; - // td->free= freeValueFunc ? freeValueFunc : td0->free; - // td->size= sizeofFunc ? sizeofFunc : td->size; - // td->set= setFunc ? setFunc : td->set; - // td->compare= compareFunc ? compareFunc : td->compare; - // td->stringify= stringifyFunc ? stringifyFunc : td->stringify; - // td->convert= convertFunc ? convertFunc : td->convert; - // - // //td->length= length; - // td->len= len ? len : td0->len; - // td->valSize= typeDef_sizeof(td); - // - // //{ - // // u_int sz2= typeDef_sizeof(td); - // // td->sz= sz2; - // // td->valSize= sz2 + sizeof(struct value_t); - // //} - // - // // typeDef_add(td); - // { - // u_int n= (typeDefs.cur)++; - // typeDefs.defs[n]= td; - // td->a= n; - // - // SddbReport( 25, "%s(): td => %p, n => %u,", fn, td, n); - // } - //} - SddbReport( 25, "%s(): td => %p,", fn, td); --- 76,88 ---- compareFunc ? compareFunc : td0->compare, stringifyFunc ? stringifyFunc : td0->stringify, ! //convertFunc ? convertFunc : td0->convert ! convertFunc ? convertFunc : td0->convert, ! validateFunc ? validateFunc : td0->validate, ! vdata ? vdata : td0->vdata ! ); if ( td ) td->base= td0; } SddbReport( 25, "%s(): td => %p,", fn, td); *************** *** 172,176 **** compareValues compareFunc, stringifyValue stringifyFunc, ! convertString convertFunc) { static char* fn= "typeDef_new"; --- 100,108 ---- compareValues compareFunc, stringifyValue stringifyFunc, ! //convertString convertFunc ! convertString convertFunc, ! validateValue validateFunc, ! void* vdata ! ) { static char* fn= "typeDef_new"; *************** *** 196,199 **** --- 128,133 ---- td->stringify= stringifyFunc; td->convert= convertFunc; + td->validate= validateFunc; + td->vdata= vdata; td->len= len; *************** *** 258,274 **** { SddbReport( 0, "%s(): td => %p", fn, td); ! SddbReport( 0, "%s():\t[%p]->name => '%s',", fn, td, td->name); ! SddbReport( 0, "%s():\t[%p]->description => '%s',", fn, td, td->description); ! SddbReport( 0, "%s():\t[%p]->len => %u,", fn, td, td->len); ! //SddbReport( 0, "%s():\t[%p]->sz => %u,", fn, td, td->sz); ! //SddbReport( 0, "%s():\t[%p]->valSize => %u,", fn, td, td->valSize); ! SddbReport( 0, "%s():\t[%p]->base => %p '%s',", fn, td, td->base, td->base?td->base->name:NULL); ! SddbReport( 0, "%s():\t[%p]->new => %p,", fn, td, td->new); ! SddbReport( 0, "%s():\t[%p]->free => %p,", fn, td, td->free); ! SddbReport( 0, "%s():\t[%p]->size => %p,", fn, td, td->size); ! SddbReport( 0, "%s():\t[%p]->set => %p,", fn, td, td->set); ! SddbReport( 0, "%s():\t[%p]->compare => %p,", fn, td, td->compare); ! SddbReport( 0, "%s():\t[%p]->stringify => %p,", fn, td, td->stringify); ! SddbReport( 0, "%s():\t[%p]->convert => %p,", fn, td, td->convert); } } --- 192,210 ---- { SddbReport( 0, "%s(): td => %p", fn, td); ! SddbReport( 0, "%s(): td->name => '%s',", fn, td->name); ! SddbReport( 0, "%s(): td->description => '%s',", fn, td->description); ! SddbReport( 0, "%s(): td->len => %u,", fn, td->len); ! //SddbReport( 0, "%s(): td->sz => %u,", fn, td->sz); ! //SddbReport( 0, "%s(): td->valSize => %u,", fn, td->valSize); ! SddbReport( 0, "%s(): td->base => %p '%s',", fn, td->base, td->base?td->base->name:NULL); ! SddbReport( 0, "%s(): td->new => %p,", fn, td->new); ! SddbReport( 0, "%s(): td->free => %p,", fn, td->free); ! SddbReport( 0, "%s(): td->size => %p,", fn, td->size); ! SddbReport( 0, "%s(): td->set => %p,", fn, td->set); ! SddbReport( 0, "%s(): td->compare => %p,", fn, td->compare); ! SddbReport( 0, "%s(): td->stringify => %p,", fn, td->stringify); ! SddbReport( 0, "%s(): td->convert => %p,", fn, td->convert); ! SddbReport( 0, "%s(): td->validate => %p,", fn, td->validate); ! SddbReport( 0, "%s(): td->vdata => %p,", fn, td->vdata); } } Index: value.c =================================================================== RCS file: /cvsroot/ceps/sddb/sddbd/database/table-definition/Attic/value.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** value.c 30 Jan 2004 12:15:17 -0000 1.1.2.5 --- value.c 31 Jan 2004 10:37:22 -0000 1.1.2.6 *************** *** 223,232 **** { if ( ! val ) v->flag |= isNull; else { typeDef_t td= v->type; value_t b=NULL; ! u_int i; SddbReport( 25, "%s(): v->len => %u, td => %p, td->len => %u, val => %p,", fn, v->len, td, td->len, val); --- 223,235 ---- { if ( ! val ) + { v->flag |= isNull; + //v=NULL; + } else { typeDef_t td= v->type; value_t b=NULL; ! u_int e=0; SddbReport( 25, "%s(): v->len => %u, td => %p, td->len => %u, val => %p,", fn, v->len, td, td->len, val); *************** *** 241,249 **** validateValue validateFunc= td->validate; SddbReport( 25, "%s(): v->type->validate => %p,", fn, validateFunc); ! i= validateFunc ? (*validateFunc)(v) : 1; } ! SddbReport( 25, "%s(): i => %i,", fn, i); ! if ( i ) v->flag &= ~isNull; else --- 244,252 ---- validateValue validateFunc= td->validate; SddbReport( 25, "%s(): v->type->validate => %p,", fn, validateFunc); ! e= validateFunc ? (*validateFunc)(v,td->vdata) : 1; } ! SddbReport( 25, "%s(): e => %u,", fn, e); ! if ( e ) v->flag &= ~isNull; else *************** *** 322,339 **** // evaluate retval for NULL values else if ( aNull && bNull ) retval=0; else if ( aNull ) retval= -1; else if ( bNull ) retval= 1; // now compare fields for non-NULL values else { if (( a == b ) || ( a->data == b->data )) retval= 0; else retval= (*(a->type->compare))(a,b,x); - //SddbReport( 25, "%s(): retval => %i,", fn, retval); } return(retval); } --- 325,353 ---- // evaluate retval for NULL values else if ( aNull && bNull ) + { + SddbReport( 25, "%s(): both are NULL", fn); retval=0; + } else if ( aNull ) + { + SddbReport( 25, "%s(): a is NULL", fn); retval= -1; + } else if ( bNull ) + { + SddbReport( 25, "%s(): b is NULL", fn); retval= 1; + } // now compare fields for non-NULL values else { + SddbReport( 25, "%s(): both fields are non-NULL", fn); if (( a == b ) || ( a->data == b->data )) retval= 0; else retval= (*(a->type->compare))(a,b,x); } + + SddbReport( 25, "%s(): retval => %i,", fn, retval); return(retval); } *************** *** 377,381 **** if ( validateFunc ) ! retval= (*validateFunc)(v); else SddbReport( 20, "%s(): value=%p, type='%s' has no validateValue function", fn, v, td->name); --- 391,395 ---- if ( validateFunc ) ! retval= (*validateFunc)(v,td->vdata); else SddbReport( 20, "%s(): value=%p, type='%s' has no validateValue function", fn, v, td->name); |