Safety commit before clean-up

[SXSI/xpathcomp.git] / OCamlDriver.cpp

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index 21e5398..03f06d5 100644 (file)
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -255,13 +255,14 @@ extern "C"  value caml_text_collection_count_lessthan(value tree,value str){
 }
 
 static value sort_alloc_array(std::vector<DocID> results, value resarray){
-    std::sort(results.begin(), results.end(), docId_comp);
+  std::sort(results.begin(), results.end(), docId_comp);
     size_t s = results.size();
     resarray = caml_alloc_tuple(s);
     for (size_t i = 0; i < s ;i++){
       caml_initialize(&Field(resarray,i),Val_int(results[i]));
     };
-    return resarray;
+    return resarray; 
+
 }
 
 /**
@@ -790,7 +791,9 @@ int iterfcns(XMLTree* tree, treeNode node){
   if (node == NULLT)
     return 0;
   else {
-    return 1+ iterfcns(tree,tree->NextSibling(node)) + iterfcns(tree,tree->FirstChild(node));    
+    int tmp = iterfcns(tree,tree->FirstElement(node));
+    tmp += iterfcns(tree,tree->NextElement(node));
+    return tmp+1;    
   };
 }