type tree
+external register_tag : tree -> string -> Tag.t = "caml_xml_tree_register_tag"
+
+external tag_name : tree -> Tag.t -> string = "caml_xml_tree_get_tag_name"
+
+let tag t = (); fun s ->
+ match s with
+ | "<$>" -> Tag.pcdata
+ | "<@>" -> Tag.attribute
+ | "" -> Tag.document_node
+ | "<@$>" -> Tag.attribute_data
+ | _ -> register_tag t s
+
+let to_string d = ();
+ fun t ->
+ if t == Tag.pcdata then "<$>"
+ else if t == Tag.attribute_data then "<@$>"
+ else if t == Tag.attribute then "<@>"
+ else if t == Tag.nullt then "<!NIL!>"
+ else tag_name d t
+
+let translate x = x
+
+let mk_tag_ops t = {
+ Tag.tag = tag t;
+ Tag.to_string = to_string t;
+ Tag.translate = translate
+}
+
module TreeBuilder =
struct
type t
external close_tag : t -> string -> unit = "caml_xml_tree_builder_new_closing_tag"
external text : t -> string -> unit = "caml_xml_tree_builder_new_text"
+ let is_whitespace s =
+ let rec loop len i =
+ if i < len then
+ let c = s.[i] in
+ (c == '\n' || c == '\t' || c == ' ') && loop len (i+1)
+ else
+ true
+ in
+ loop (String.length s) 0
+
+
+ let display_count =
+ let event_counter = ref 0 in
+ (fun parser_ ->
+ incr event_counter;
+ if !event_counter land 0xffffff == 0 then
+ Printf.eprintf "Current position: %i\n%!" (Expat.get_current_byte_index parser_))
let do_text b t =
if Buffer.length t > 0 then begin
- open_tag b "<$>";
- text b (Buffer.contents t);
- close_tag b "<$>";
+ let s = Buffer.contents t in
+ begin
+ open_tag b "<$>";
+ text b s;
+ close_tag b "<$>";
+ end;
Buffer.clear t
end
let atname = "<@>" ^ name in
open_tag b atname;
open_tag b "<@$>";
- text b value;
- close_tag b "<@$>";
- close_tag b atname
+ text b value;
+ close_tag b "<@$>";
+ close_tag b atname
- let start_element_handler b t tag attr_list =
+ let start_element_handler parser_ b t tag attr_list =
+ display_count parser_;
do_text b t;
open_tag b tag;
match attr_list with
| l ->
open_tag b "<@>";
List.iter (fun (name, value) -> output_attr b name value) l;
- close_tag b "<@>"
+ close_tag b "<@>"
- let end_element_handler b t tag =
+ let end_element_handler parser_ b t tag =
+ display_count parser_;
do_text b t;
close_tag b tag
- let character_data_handler _b t text =
+ let character_data_handler parser_ _ t text =
+ display_count parser_;
Buffer.add_string t text
let create_parser () =
let finalize () =
do_text build buf;
close_tag build "";
- close_document build
+ Printf.eprintf "Finished Parsing\n%!";
+ Printf.eprintf "Started Index construction\n%!";
+ let r = close_document build in
+ Printf.eprintf "Finished Index construction\n%!";
+ r
in
- Expat.set_start_element_handler parser_ (start_element_handler build buf);
- Expat.set_end_element_handler parser_ (end_element_handler build buf);
- Expat.set_character_data_handler parser_ (character_data_handler build buf);
+ Expat.set_start_element_handler parser_ (start_element_handler parser_ build buf);
+ Expat.set_end_element_handler parser_ (end_element_handler parser_ build buf);
+ Expat.set_character_data_handler parser_ (character_data_handler parser_ build buf);
+ Printf.eprintf "Started Parsing\n%!";
open_document build !Options.index_empty_texts !Options.sample_factor
!Options.disable_text_collection !Options.text_index_type;
open_tag build "";
in
finalizer ()
-
-
end
}
-
+let tag_operations t = mk_tag_ops t.doc
(*
external parse_xml_uri : string -> int -> bool -> bool -> int -> tree = "caml_call_shredder_uri"
external parse_xml_string : string -> int -> bool -> bool -> int -> tree = "caml_call_shredder_string"
external tree_next_element : tree -> [`Tree] Node.t -> [`Tree] Node.t = "caml_xml_tree_next_element" "noalloc"
let next_element t n = tree_next_element t.doc n
+external tree_next_node_before : tree -> [`Tree] Node.t -> [`Tree] Node.t -> [`Tree] Node.t = "caml_xml_tree_next_node_before" "noalloc"
+let next_node_before t n ctx = tree_next_node_before t.doc n ctx
+
external tree_tagged_following_sibling : tree -> [`Tree] Node.t -> Tag.t -> [`Tree] Node.t = "caml_xml_tree_tagged_following_sibling" "noalloc"
let tagged_following_sibling t n tag = tree_tagged_following_sibling t.doc n tag
let is_root t = t == root
let node_of_t t =
- let _ = Tag.init (Obj.magic t) in
+ eprintf "Initializing tag structure\n%!";
+ let _ = Tag.init (mk_tag_ops t) in
+ eprintf "Starting tag table construction\n%!";
let f, n, c, d = time collect_labels t ~msg:"Building tag relationship table" in
let c = Array.map TagS.to_ptset c in
let n = Array.map TagS.to_ptset n in
let size t = tree_size t.doc;;
-external pool : tree -> Tag.pool = "%identity"
-
let magic_string = "SXSI_INDEX"
let version_string = "3"
let save t str =
let fd = Unix.openfile str [ Unix.O_WRONLY;Unix.O_TRUNC;Unix.O_CREAT] 0o644 in
let out_c = Unix.out_channel_of_descr fd in
+ let index_prefix = Filename.chop_suffix str ".srx" in
let _ = set_binary_mode_out out_c true in
output_string out_c magic_string;
output_char out_c '\n';
(* we need to move the fd to the correct position *)
flush out_c;
ignore (Unix.lseek fd (pos_out out_c) Unix.SEEK_SET);
- tree_save t.doc fd str;
+ tree_save t.doc fd index_prefix;
close_out out_c
;;
let load_tag_table channel =
let load ?(sample=64) ?(load_text=true) str =
let fd = Unix.openfile str [ Unix.O_RDONLY ] 0o644 in
let in_c = Unix.in_channel_of_descr fd in
+ let index_prefix = Filename.chop_suffix str ".srx" in
let _ = set_binary_mode_in in_c true in
let load_table () =
(let ms = input_line in_c in if ms <> magic_string then failwith "Invalid index file");
in
let c, s, d, f = time ~msg:"Loading tag table"(load_table) () in
ignore(Unix.lseek fd (pos_in in_c) Unix.SEEK_SET);
- let xml_tree = tree_load fd str load_text sample in
- Printf.eprintf "Root is: %i\n" (Obj.magic (tree_root xml_tree));
+ let xml_tree = tree_load fd index_prefix load_text sample in
let () = Tag.init (Obj.magic xml_tree) in
let attributes = Ptset.Int.add Tag.attribute d.(Tag.attribute) in
let elements = Ptset.Int.add Tag.document_node
-let tag_pool t = pool t.doc
-
let equal a b = a == b
let nts = function
projects / SXSI / xpathcomp.git / blobdiff