X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=vector%2Ftupleitem.c;h=f3dfe2c70b0aff012c7b39397f3881817148bd81;hb=62e848c28a7083828fd47cbd8a29fbc875cf3ecb;hp=55328c5446624abda6224bc07993acfcaacdc0c9;hpb=65c1d7e61e1f70fc92214836487dd58f137e2758;p=rrq%2Frrqmisc.git diff --git a/vector/tupleitem.c b/vector/tupleitem.c index 55328c5..f3dfe2c 100644 --- a/vector/tupleitem.c +++ b/vector/tupleitem.c @@ -99,6 +99,28 @@ static void tupleitem_releasekey(void *this,void *key) { free( key ); } +#define OUT(X) a = X; if ( a > limit ) return 0; buffer += a; limit -= a + +/** + * This callback function writes a representation of an item into + * a character buffer. + */ +static int tupleitem_tostring(void *this,void *item,char *buffer,int limit) { + tupleschema *def = (tupleschema *) this; + tuple *t = (tuple*) item; + char *x = "<"; + int a, i; + for ( i = 0; i < def->arity; i++ ) { + OUT( snprintf( buffer, limit, x ) ); + x = ","; + OUT( def->columns[i]->tostring( + def->columns[i], (*t)[i], buffer, limit ) ); + } + OUT( snprintf( buffer, limit, ">" ) ); + return a; +} + + // Allocate tuple *tuple_create(int arity,...) { va_list ap; @@ -116,7 +138,8 @@ itemkeyfun tupleschema_callbacks = { .hashcode = tupleitem_hashcode, .haskey = tupleitem_haskey, .itemkey = tupleitem_itemkey, - .releasekey = tupleitem_releasekey + .releasekey = tupleitem_releasekey, + .tostring = tupleitem_tostring }; tupleschema *tupleschema_create(int arity,tuple *columns) { @@ -160,4 +183,3 @@ unsigned long tuple_mask(int arity,tuple *t) { } return mask; } -