Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22345
Modified Files:
batxml.mx
Log Message:
Make sure the XML aggregate delivers oids instead of nils.
Index: batxml.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/batxml.mx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- batxml.mx 7 Sep 2007 20:53:40 -0000 1.17
+++ batxml.mx 8 Sep 2007 09:08:35 -0000 1.18
@@ -877,12 +877,21 @@
{
BAT *b, *g;
str msg= MAL_SUCCEED;
- oid o= oid_nil;
+ oid o= 0;
+ BUN p,q;
+ int xx;
@:getBATdescriptor(bid,b,"xml.group")@
- g= BATmirror(BATconst(b,TYPE_oid,(ptr) &o));
- msg= BATXMLagg(ret,&g->batCacheid,bid);
+
+ g= BATnew(BAThtype(b),TYPE_oid,BATcount(b));
+ BATloopFast(b, p, q, xx) {
+ ptr v = BUNhead(b,p);
+ bunfastins(g,v, &o);
+ }
+ msg= BATXMLagg(ret,bid,&g->batCacheid);
+bunins_failed:
BBPunfix(g->batCacheid);
+ BBPunfix(b->batCacheid);
return msg;
}
str
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
