Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14935/runtime
Modified Files:
pf_support.mx
Log Message:
propagated changes of Wednesday Jun 06 2007 - Wednesday Jun 06 2007
from the XQuery_0-18 branch to the development trunk
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- pf_support.mx 6 Jun 2007 20:19:31 -0000 1.245
+++ pf_support.mx 6 Jun 2007 21:28:44 -0000 1.246
@@ -947,7 +947,6 @@
type_str := "double";
} else if (type_id = 32) {
type_str := "boolean";
- item := (item = [EMAIL PROTECTED]);
} else if (type_id = 64) {
type_str := "QName";
} else if (type_id = 128) {
@@ -1007,36 +1006,10 @@
new (void,str).seqbase([EMAIL
PROTECTED]));
} else {
# attribute nodes
- var qn_id := ws.fetch(ATTR_QN)
- .fetch(frag)
- .reverse()
- .select(node_id)
- .reverse()
- .fetch(0);
- var qn_frag := ws.fetch(ATTR_CONT)
- .fetch(frag)
- .reverse()
- .select(node_id)
- .reverse()
- .fetch(0);
- var prop := ws.fetch(ATTR_PROP)
- .fetch(frag)
- .reverse()
- .select(node_id)
- .reverse()
- .fetch(0);
- var cont := ws.fetch(ATTR_CONT)
- .fetch(frag)
- .reverse()
- .select(node_id)
- .reverse()
- .fetch(0);
- var val := ws.fetch(PROP_VAL)
- .fetch(cont)
- .reverse()
- .select(prop)
- .reverse()
- .fetch(0);
+ var qn_id := mposjoin (node_id, frag,
ws.fetch(ATTR_QN)).fetch(0);
+ var qn_frag := mposjoin (node_id, frag,
ws.fetch(ATTR_CONT)).fetch(0);
+ var prop := mposjoin (node_id, frag,
ws.fetch(ATTR_PROP)).fetch(0);
+ var val := mposjoin (prop, qn_frag,
ws.fetch(PROP_VAL)).fetch(0);
var name := trace_qname_uri (qn_id, qn_frag);
printf (" name=\"%s\" value=\"%s\">", name, val);
}
@@ -1057,24 +1030,9 @@
# qname.
PROC trace_qname_uri (oid item, oid frag) : str
{
- var local := ws.fetch(QN_LOC)
- .fetch(frag)
- .reverse()
- .select(item)
- .reverse()
- .fetch(0);
- var prefix := ws.fetch(QN_PREFIX)
- .fetch(frag)
- .reverse()
- .select(item)
- .reverse()
- .fetch(0);
- var uri := ws.fetch(QN_URI)
- .fetch(frag)
- .reverse()
- .select(item)
- .reverse()
- .fetch(0);
+ var local := mposjoin (item, frag, ws.fetch(QN_LOC)).fetch(0);
+ var prefix := mposjoin (item, frag, ws.fetch(QN_PREFIX)).fetch(0);
+ var uri := mposjoin (item, frag, ws.fetch(QN_URI)).fetch(0);
if (and (prefix = "", uri = "")) {
return local;
} else if (prefix = "") {
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
