X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fquery_tree.ml;h=a81804792e063f7f381c816cef6e2e8b542238fa;hp=404c750db76153bcae62c9a4b0915cef3f078399;hb=11fd750e5f19e421768ec72c511b631e7b009365;hpb=bf8537a562ad461cdecc45978c36e5ad2b35766f

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 404c750..a818047 100644
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -5,7 +5,8 @@ let table_query_tree = Hashtbl.create 97
 let table_qtree = QTreeHash.create 97
 
 let all_nodes tree = let root = Naive_tree.root tree in
-		     eval_axis tree [root] (Descendant true)
+		     let acc1 = get_descendant tree [root] in
+		     root::acc1
 
 let element_by_tag tree tagset kind = let dom = all_nodes tree in
 			      List.filter (fun c ->
@@ -89,33 +90,8 @@ let compile_xpath p = match p with
   | [p] -> compile_single_path p
   | p::r -> List.fold_left (fun acc p -> mk_node (Binop (Union , acc, compile_single_path p) )) (compile_single_path p) r
 
-let comp_node t n1 n2 = (Naive_tree.preorder t n1) < (Naive_tree.preorder t n2)
 
 
-let rec union_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> l2
-    | l1, [] -> l1
-    | h1::ll1, h2::ll2 -> if (comp_node t h2 h1) then h2 :: (union_list t l1 ll2)
-      else if (comp_node t h1 h2) then h1::(union_list t ll1 l2)
-      else h1 ::(union_list t ll1 ll2)
-
-let rec inter_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> []
-    | l1, [] -> []
-    | h1::ll1, h2::ll2 -> if (comp_node t h1 h2) then inter_list t ll1 l2
-      else if (comp_node t h2 h1) then inter_list t l1 ll2
-      else h1 :: (inter_list t ll1 ll2)
-
-let rec diff_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> []
-    | l1, [] -> l1
-    | h1::ll1, h2::ll2 -> if (comp_node t h1 h2) then h1::(diff_list t ll1 l2)
-      else if (comp_node t h2 h1)  then h2 :: (diff_list t l1 ll2)
-      else diff_list t ll1 ll2
-
 
 let do_debug = ref false
 
@@ -155,38 +131,6 @@ and compare_axis a1 a2 =
     | Ancestor b1, Ancestor b2 -> b1==b2
     | _,_ -> false
 
-
-let rec eval_query_tree tree start q =
-  let resultat = 
-    begin
-      try
-	Hashtbl.find table_query_tree q
-      with Not_found ->	
-	let res =
-	match q.desc with
-	  | Start -> start
-	  | Dom ->  all_nodes tree 	    
-	  | Tag (t,k) -> element_by_tag tree t k 		     
-	  | Axis (a,q1) -> let ls = eval_query_tree tree start q1 in
-			   eval_axis tree ls a 			   
-	  | Binop (op,q1,q2)-> begin
-	    let ls1 = eval_query_tree tree start q1 in
-	    let ls2 = eval_query_tree tree start q2 in
-	    match op with	  
-	      | Union -> union_list tree ls1 ls2	    
-	      | Inter -> inter_list tree ls1 ls2
-	      | Diff -> diff_list tree ls1 ls2
-	  end
-	in
-	let res = List.sort (Table.compare_node tree) res in
-	Hashtbl.add table_query_tree q res;
-	compteur := !compteur + (List.length res);
-	res
-    end
-  in
-  debug tree q resultat;
-  resultat
-
 let mini_id = ref 0
 let mini_table = QTreeHash.create 17 
 
@@ -236,8 +180,6 @@ let rec eval_qtree tree start q =
 	      | Diff -> diff_list tree ls1 ls2
 	  end
 	in
-(*	let res = Tas.sort_of_list tree res in
-	let res = List.sort (Table.compare_node tree) res in*)
 	QTreeHash.add table_qtree q res;
 	compteur := !compteur + (List.length res);
 	res