TAG(tag))));
}
-NoAlloc extern "C" value caml_xml_tree_subtree_elements(value tree, value node)
+NoAlloc extern "C" value caml_xml_tree_subtree_elements(value tree, value node,
+ value atts)
{
- return (Val_int(XMLTREE(tree)->subtree_elements(TREENODE(node))));
+ return (Val_int(XMLTREE(tree)->subtree_elements(TREENODE(node),
+ TAGLIST(atts))));
}
NoAlloc extern "C" value caml_xml_tree_is_leaf(value tree, value node){
/** Full reporting into a bit vector
*/
-static std::vector<int32_t> sort_results(std::vector<int32_t> v)
+static void pr_vector(std::vector<int32_t> v)
+{
+ for(auto i = v.begin(); i!= v.end(); ++i)
+ fprintf(stderr, "%i ", *i);
+ fprintf(stderr, "\n");
+}
+static std::vector<int32_t> sort_results(std::vector<int32_t> v, xml_tree *t)
{
std::vector<int32_t> res;
std::sort(v.begin(), v.end());
if (i == v.end()) return res;
};
prev = *i;
- res.push_back(prev);
+ res.push_back(t->parent_node(prev));
};
return res;
}
#define BV_QUERY(pref, Pref) \
extern "C" value caml_text_collection_## pref ##_bv(value tree, value str, value dobvv){ \
- CAMLparam3(tree, str, dobvv); \
+ CAMLparam3(tree, str, dobvv); \
CAMLlocal3(res, res_bv, res_array); \
int j; \
uchar * cstr = (uchar *) strdup(String_val(str)); \
std::vector<int32_t> uresults = XMLTREE(tree)->Pref(cstr); \
- std::vector<int32_t> results = sort_results(uresults); \
+ std::vector<int32_t> results = sort_results(uresults, XMLTREE(tree)); \
bool dobv = Bool_val(dobvv); \
res_bv = caml_alloc_string(dobv ? ((XMLTREE(tree)->size() / 4) + 2) : 0); \
unsigned long slen = caml_string_length(res_bv); \
memset(&(Byte(res_bv,0)), 0, slen); \
res_array = caml_alloc_shr(results.size(), 0); \
for (unsigned int i = 0; i < results.size(); ++i) { \
- j = XMLTREE(tree)->parent_node(results[i]); \
+ j = results[i]; \
if (dobv) { \
Byte(res_bv, j >> 3) |= (1 << (j & 7)); \
}; \
caml_initialize(&Field(res_array, i), Val_int(j)); \
}; \
+ fprintf(stderr, "Raw results: %i, Sorted reulsts %i\n", uresults.size(), results.size()); \
free(cstr); \
res = caml_alloc(2, 0); \
Store_field(res, 0, res_bv); \