}
extern "C" CAMLprim value caml_text_collection_get_text(value tree, value id){
- CAMLparam2(tree,id);
- const char* txt = (const char*) (XMLTREE(tree)->GetText((DocID) Int_val(id)));
- CAMLreturn (caml_copy_string(txt));
+ CAMLparam2(tree,id);
+ CAMLlocal1(str);
+ uchar* txt = XMLTREE(tree)->GetText((DocID) Int_val(id));
+ str = caml_copy_string((const char*)txt);
+ delete (txt);
+ CAMLreturn (str);
}
extern "C" CAMLprim value caml_text_collection_empty_text(value tree,value id){
CAMLparam2(tree,id);
uchar * cstr = (uchar *) String_val(str);
std::vector<DocID> results;
results = XMLTREE(tree)->Contains(cstr);
-
+ //free(cstr);
resarray = caml_alloc_tuple(results.size());
for (unsigned int i=0; i<results.size();i++){
}
extern "C" CAMLprim value caml_xml_tree_parent_doc(value tree, value id){
CAMLparam2(tree,id);
- CAMLreturn(Val_int (XMLTREE(tree)->ParentNode(TREENODEVAL(id))));
+ CAMLreturn(Val_int (XMLTREE(tree)->ParentNode((DocID) Int_val(id))));
}
extern "C" CAMLprim value caml_xml_tree_is_ancestor(value tree,value id1, value id2) {
CAMLreturn(Val_bool (XMLTREE(tree)->IsLeaf(TREENODEVAL(id))));
}
+extern "C" CAMLprim value caml_xml_tree_tagged_desc(value tree, value id, value tag){
+ CAMLparam3(tree,id,tag);
+ CAMLreturn(Val_int (XMLTREE(tree)->TaggedDesc(TREENODEVAL(id),(TagType) Int_val(tag))));
+}
+
+extern "C" CAMLprim value caml_xml_tree_tagged_next(value tree, value id, value tag){
+ CAMLparam3(tree,id,tag);
+ CAMLreturn(Val_int (XMLTREE(tree)->TaggedNext(TREENODEVAL(id),(TagType) Int_val(tag))));
+}
+
+
+
+
+extern "C" CAMLprim value caml_xml_tree_tagged_foll(value tree, value id, value tag){
+ CAMLparam3(tree,id,tag);
+ CAMLreturn(Val_int (XMLTREE(tree)->TaggedFoll(TREENODEVAL(id),(TagType) Int_val(tag))));
+}
+
+
extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){
CAMLparam2(tree,id);
CAMLreturn(Val_int (XMLTREE(tree)->NextSibling(TREENODEVAL(id))));
CAMLparam2(tree,id);
CAMLreturn(Val_int((XMLTREE(tree)->NodeXMLId(TREENODEVAL(id)))));
}
-extern "C" CAMLprim value caml_xml_tree_tag(value tree, value id){
- CAMLparam2(tree,id);
- const char* tag;
- tag =(const char*) XMLTREE(tree)->GetTagName(XMLTREE(tree)->Tag(TREENODEVAL(id)));
-
- CAMLreturn (caml_copy_string(tag));
-}
extern "C" CAMLprim value caml_xml_tree_tag_name(value tree, value tagid){
CAMLparam2(tree,tagid);
- const char* tag;
- tag = (const char*) XMLTREE(tree)->GetTagName((TagType) (Int_val(tagid)));
-
- CAMLreturn (caml_copy_string(tag));
+ CAMLlocal1(str);
+ char* tag;
+ tag = (char*) XMLTREE(tree)->GetTagNameByRef((TagType) (Int_val(tagid)));
+ str = caml_copy_string((const char*) tag);
+ CAMLreturn (str);
}
CAMLreturn (Val_int(XMLTREE(tree)->Tag(TREENODEVAL(id))));
}
+extern "C" CAMLprim value caml_xml_tree_subtree_tags(value tree,value id,value tag){
+ CAMLparam3(tree,id,tag);
+ CAMLreturn (Val_int(XMLTREE(tree)->SubtreeTags(TREENODEVAL(id),Int_val(tag))));
+}
+
+
extern "C" CAMLprim value caml_xml_tree_register_tag(value tree,value str){
CAMLparam2(tree,str);
CAMLlocal1(id);
CAMLparam1(unit);
CAMLreturn (NULLT);
}
+
+extern "C" CAMLprim value caml_xml_tree_save(value tree,value filename){
+ CAMLparam2(tree,filename);
+ XMLTREE(tree)->Save((unsigned char *) String_val(filename));
+ CAMLreturn (Val_unit);
+}
+
+extern "C" CAMLprim value caml_xml_tree_load(value filename,value samplerate){
+ CAMLparam2(filename,samplerate);
+ CAMLlocal1(doc);
+ XMLTree * tree;
+ tree = XMLTree::Load((unsigned char *) String_val(filename),Int_val(samplerate));
+ caml_init_ops();
+ doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
+ memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
+ CAMLreturn(doc);
+}