projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test cases
[SXSI/xpathcomp.git]
/
OCamlDriver.cpp
diff --git
a/OCamlDriver.cpp
b/OCamlDriver.cpp
index
723f9d9
..
e3b5f44
100644
(file)
--- a/
OCamlDriver.cpp
+++ b/
OCamlDriver.cpp
@@
-125,9
+125,12
@@
extern "C" CAMLprim value caml_cpp_traversal(value tree){
}
extern "C" CAMLprim value caml_text_collection_get_text(value tree, value id){
}
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);
}
extern "C" CAMLprim value caml_text_collection_empty_text(value tree,value id){
CAMLparam2(tree,id);
@@
-153,7
+156,7
@@
extern "C" CAMLprim value caml_text_collection_contains(value tree,value str){
uchar * cstr = (uchar *) String_val(str);
std::vector<DocID> results;
results = XMLTREE(tree)->Contains(cstr);
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++){
resarray = caml_alloc_tuple(results.size());
for (unsigned int i=0; i<results.size();i++){
@@
-177,7
+180,7
@@
extern "C" CAMLprim value caml_xml_tree_parent(value tree, value id){
}
extern "C" CAMLprim value caml_xml_tree_parent_doc(value tree, value id){
CAMLparam2(tree,id);
}
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) {
}
extern "C" CAMLprim value caml_xml_tree_is_ancestor(value tree,value id1, value id2) {
@@
-236,20
+239,14
@@
extern "C" CAMLprim value caml_xml_tree_node_xml_id(value tree, value id){
CAMLparam2(tree,id);
CAMLreturn(Val_int((XMLTREE(tree)->NodeXMLId(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);
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);
}
}