Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5248/runtime
Modified Files:
Tag: PF_ROX
shredder.mx
Log Message:
some bugs after toying with uniprot_sprot.xml mostly ns related
- shredder: a document with default ns would not attach that ns to attributes
- move heuristic phase past qn resolution (namespaces do not work in index
plans, breaking the current mps release)
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.134.4.1
retrieving revision 1.134.4.2
diff -u -d -r1.134.4.1 -r1.134.4.2
--- shredder.mx 24 Feb 2008 20:42:59 -0000 1.134.4.1
+++ shredder.mx 7 Mar 2008 21:51:47 -0000 1.134.4.2
@@ -986,6 +986,10 @@
const xmlChar *a_val = atts[i+3];
const xmlChar *a_end = atts[i+4];
+ /* libxml2 apparently does not provide default namespaces for
attributes, recover them from the element */
+ if (a_pfx == NULL && e_pfx == NULL && e_uri)
+ a_uri = e_uri;
+
#ifdef DEBUG
stream_printf(GDKout, " attr(");
if (a_uri) stream_printf(GDKout, "uri=%s, ", a_uri);
@@ -994,10 +998,6 @@
stream_printf(GDKout, ", val=\"%s\"", a_val);
stream_printf(GDKout, ")\n");
#endif
- if (!a_pfx && a_uri) {
- a_uri = NULL; /* attribute without prefix cannot have a namespace */
- }
-
int attrType;
char* idref_suffix = NULL;
if ((attrType =
attrDB_check(&shredCtx->idrefAttrDB,(char*)e_loc,(char*)a_tag))) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
