X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FnodeSet.ml;h=c2265b2d7430f1ee5b4b4cbcc6971e04acdbee10;hb=3fbeef47be08dd39be31af8dedfcdda30ac63f6f;hp=944f85c0dfae609a31072e1a6d47f7691abbd204;hpb=35b9abd60699383b0cebf25e905049d3d7027271;p=SXSI%2Fxpathcomp.git
diff --git a/src/nodeSet.ml b/src/nodeSet.ml
index 944f85c..c2265b2 100644
--- a/src/nodeSet.ml
+++ b/src/nodeSet.ml
@@ -52,7 +52,12 @@ module Count : S with type t = int =
let fold _ _ _ = failwith "fold not implemented"
let map _ _ = failwith "map not implemented"
let length x = x
- let serialize _ _ _ = ()
+ let serialize f _ x =
+ let o = open_out f in
+ output_string o "\n";
+ output_string o (string_of_int x);
+ output_string o "\n\n";
+ close_out o
end
type clist =
@@ -117,13 +122,13 @@ module Mat : S with type t = Tree.node mat =
if Tree.tag tree t == tag then t
else Tree.tagged_descendant tree t tag
- let fst_element tree t =
+(*
+ let fst_element tree t =
let tag = Tree.tag tree t in
- let t = if Ptset.Int.mem tag
- (Ptset.Int.remove Tag.document_node (Tree.element_tags tree))
- then t
- else Tree.first_element tree t
- in Tree.first_element tree t
+ if tag == Tag.document_node then
+ Tree.first_element tree t
+ else t
+*)
let element_fold f tree t acc =
let rec loop node acc =
@@ -133,17 +138,11 @@ module Mat : S with type t = Tree.node mat =
let acc' = loop (Tree.first_element tree node) acc in
loop (Tree.next_element tree node) acc'
in
- loop (fst_element tree t) acc
+ let t' = Tree.first_element tree t in loop t' acc
let element_iter f tree t =
- let rec loop node =
- if node != Tree.nil then begin
- f node;
- loop (Tree.first_element tree node);
- loop (Tree.next_element tree node)
- end
- in
- let t' = fst_element tree t in loop t'
+ let newf = fun e () -> f e in
+ element_fold newf tree t ()
let tag_fold f tree t tag acc =
let rec loop close node acc =
@@ -200,8 +199,10 @@ module Mat : S with type t = Tree.node mat =
Unix.close
in
ignore (Unix.write fd "\n" 0 13);
- iter (fun node -> Tree.print_xml v node fd) l;
- Tree.flush v fd;
+ if l.length > 0 then begin
+ iter (fun node -> Tree.print_xml v node fd) l;
+ Tree.flush v fd;
+ end;
ignore (Unix.write fd "\n" 0 14);
finish fd