mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-10-26 20:25:14 +03:00
added the possibility of returning nodesets from XPath extension functions
* python/types.c python/tests/Makefile.am python/tests/xpathret.py: added the possibility of returning nodesets from XPath extension functions written in Python Daniel
This commit is contained in:
parent
a94ec6ff13
commit
79426f2b46
@ -1,3 +1,9 @@
|
||||
Fri Mar 1 17:12:15 CET 2002 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* python/types.c python/tests/Makefile.am python/tests/xpathret.py:
|
||||
added the possibility of returning nodesets from XPath extension
|
||||
functions written in Python
|
||||
|
||||
Fri Mar 1 13:56:12 CET 2002 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* python/*: commiting some Python bindings work done while travelling
|
||||
|
@ -10,6 +10,7 @@ PYTESTS= \
|
||||
error.py \
|
||||
validate.py \
|
||||
tstURI.py \
|
||||
xpathret.py \
|
||||
xpath.py
|
||||
|
||||
XMLS= \
|
||||
|
57
python/tests/xpathret.py
Executable file
57
python/tests/xpathret.py
Executable file
@ -0,0 +1,57 @@
|
||||
#!/usr/bin/python -u
|
||||
import sys
|
||||
import libxml2
|
||||
|
||||
#memory debug specific
|
||||
libxml2.debugMemory(1)
|
||||
|
||||
#
|
||||
# A document hosting the nodes returned from the extension function
|
||||
#
|
||||
mydoc = libxml2.newDoc("1.0")
|
||||
|
||||
def foo(ctx, str):
|
||||
global mydoc
|
||||
|
||||
#
|
||||
# test returning a node set works as expected
|
||||
#
|
||||
parent = mydoc.newDocNode(None, 'p', None)
|
||||
mydoc.addChild(parent)
|
||||
node = mydoc.newDocText(str)
|
||||
parent.addChild(node)
|
||||
return [parent]
|
||||
|
||||
doc = libxml2.parseFile("tst.xml")
|
||||
ctxt = doc.xpathNewContext()
|
||||
libxml2.registerXPathFunction(ctxt._o, "foo", None, foo)
|
||||
res = ctxt.xpathEval("foo('hello')")
|
||||
if type(res) != type([]):
|
||||
print "Failed to return a nodeset"
|
||||
sys.exit(1)
|
||||
if len(res) != 1:
|
||||
print "Unexpected nodeset size"
|
||||
sys.exit(1)
|
||||
node = res[0]
|
||||
if node.name != 'p':
|
||||
print "Unexpected nodeset element result"
|
||||
sys.exit(1)
|
||||
node = node.children
|
||||
if node.type != 'text':
|
||||
print "Unexpected nodeset element children type"
|
||||
sys.exit(1)
|
||||
if node.content != 'hello':
|
||||
print "Unexpected nodeset element children content"
|
||||
sys.exit(1)
|
||||
|
||||
doc.freeDoc()
|
||||
mydoc.freeDoc()
|
||||
ctxt.xpathFreeContext()
|
||||
|
||||
#memory debug specific
|
||||
libxml2.cleanupParser()
|
||||
if libxml2.debugMemory(1) == 0:
|
||||
print "OK"
|
||||
else:
|
||||
print "Memory leak %d bytes" % (libxml2.debugMemory(1))
|
||||
libxml2.dumpMemory()
|
@ -372,10 +372,30 @@ libxml_xmlXPathObjectPtrConvert(PyObject * obj) {
|
||||
|
||||
for (i = 0;i < PyList_Size(obj);i++) {
|
||||
node = PyList_GetItem(obj, i);
|
||||
if ((node == NULL) || (node->ob_type == NULL) ||
|
||||
(!PyCObject_Check(node)))
|
||||
if ((node == NULL) || (node->ob_type == NULL))
|
||||
continue;
|
||||
cur = PyxmlNode_Get(node);
|
||||
|
||||
cur = NULL;
|
||||
if (PyCObject_Check(node)) {
|
||||
printf("Got a CObject\n");
|
||||
cur = PyxmlNode_Get(node);
|
||||
} else if (PyInstance_Check(node)) {
|
||||
PyInstanceObject *inst = (PyInstanceObject *) node;
|
||||
PyObject *name = inst->in_class->cl_name;
|
||||
if PyString_Check(name) {
|
||||
char *type = PyString_AS_STRING(name);
|
||||
PyObject *wrapper;
|
||||
|
||||
if (!strcmp(type, "xmlNode")) {
|
||||
wrapper = PyObject_GetAttrString(node, "_o");
|
||||
if (wrapper != NULL) {
|
||||
cur = PyxmlNode_Get(wrapper);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
printf("Unknown object in Python return list\n");
|
||||
}
|
||||
if (cur != NULL) {
|
||||
xmlXPathNodeSetAdd(set, cur);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user