WIP on beautyfying the pretty-printing module.

[SXSI/xpathcomp.git] / src / options.ml

diff --git a/src/options.ml b/src/options.ml
index 1e349a6..197982d 100644 (file)
--- a/src/options.ml
+++ b/src/options.ml
@@ -1,4 +1,3 @@
-open Utils
 open Format
 
 let index_empty_texts = ref true
@@ -14,12 +13,14 @@ let count_only = ref false
 let time = ref false
 let bottom_up = ref false
 let no_jump = ref false
+let no_cache = ref false
 let verbose = ref false
 let text_index_type = ref 0
 let do_perf = ref false
 let twopass = ref false
 let repeat = ref 1
 let docstats = ref false
+let no_wrap_results = ref false
 
 let set_index_type = function
   | "default" -> text_index_type := 0
@@ -41,13 +42,13 @@ let set_logger s =
   List.iter (fun t ->
     if t = "" then ()
     else
-      match String.explode t ':' with
+      match Utils.String.explode t ':' with
        [ tr; lvl ] ->
          let l = try int_of_string lvl with _ -> raise (Arg.Bad (lvl)) in
          if Logger.is_logger tr then Logger.activate tr l
          else raise (Arg.Bad (t))
       | _ -> raise (Arg.Bad (t))
-  ) (String.explode s ',')
+  ) (Utils.String.explode s ',')
 
 let pretty_loggers () =
   ignore(flush_str_formatter());
@@ -81,6 +82,10 @@ let spec = Arg.align
 
     "-nj", Arg.Set(no_jump), " disable jumping";
 
+    "-nc", Arg.Set(no_cache), " disable caching";
+
+    "-nw", Arg.Set(no_wrap_results), " do not wrap results in <xml_results/>";
+
     "-p",  Arg.Set(do_perf), " dump perf counters (Linux only)";
 
     "-index-type", Arg.Symbol ([ "default"; "swcsa"; "rlcsa" ],
@@ -109,7 +114,8 @@ let parse_cmdline() =
   let _ = Arg.parse spec anon_fun usage_msg
   in
   if (!pos > 3 || !pos < 2)
-  then begin Arg.usage spec usage_msg; exit 1 end
+  then begin Arg.usage spec usage_msg; exit 1 end;
+  Logger.set_verbose !verbose