Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2289/runtime
Modified Files:
pathfinder.mx serialize_dflt.mx
Log Message:
propagated changes of Friday Aug 03 2007 - Saturday Aug 04 2007
from the XQuery_0-18 branch to the development trunk
Index: serialize_dflt.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/serialize_dflt.mx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serialize_dflt.mx 3 Aug 2007 16:09:45 -0000 1.41
+++ serialize_dflt.mx 3 Aug 2007 22:56:45 -0000 1.42
@@ -223,10 +223,8 @@
static void
emit_escaped_comment (XqueryCtx* ctx, char* src) {
int start = 0, end;
- unsigned char isspecial_ch;
for(end = 0; src[end]; end++) {
- isspecial_ch = dflt_ws->isspecial_tab[(int)(unsigned char)src[end]];
/* XXX do we need to do anything special for other special characters? */
if (src[end] == '\n') {
/* print all characters that were collected
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- pathfinder.mx 2 Aug 2007 22:36:08 -0000 1.375
+++ pathfinder.mx 3 Aug 2007 22:56:45 -0000 1.376
@@ -2483,7 +2483,7 @@
var key_pre := vx_lookup(ws, cont, key_val, uri, loc, false);
if (isid) { # for ID() we also perform NID access; merging with IDs,
conserves pre-order
- id_pre :=
id_split.leftjoin(split_nids).leftjoin(nid_rid).[swizzle](map_pid).tsort();
+ id_pre :=
id_split.leftjoin(split_nids).leftjoin(nid_rid).ord_select(oid_nil,oid_nil).[swizzle](map_pid).tsort();
id_pre := merged_union(id_pre.tmark([EMAIL PROTECTED]),
key_pre.tmark([EMAIL PROTECTED]),
id_pre.hmark([EMAIL PROTECTED]),
key_pre.hmark([EMAIL PROTECTED]).leftfetchjoin(key_id));
key_pre := id_pre.fetch(0);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
