More option printing fixes.

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@1119 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/src/options.ml b/src/options.ml
index 6395b5c..07f8ffb 100644 (file)
--- a/src/options.ml
+++ b/src/options.ml
@@ -20,7 +20,7 @@ let set_index_type = function
   | "rlcsa" -> text_index_type := 2
   | s -> raise (Arg.Bad(s))
 
-let usage_msg = Printf.sprintf "%s <input.{xml|srx}> 'query' [output]" Sys.argv.(0)
+let usage_msg = Printf.sprintf "%s [options] <input.{xml|srx}> 'query' [output]" Sys.argv.(0)
 
 
 let pos = ref 0
@@ -31,33 +31,38 @@ let anon_fun =
     | 2 -> output_file := Some s; incr pos
     | _ -> raise (Arg.Bad(s))
 
-let spec = [ "-c", Arg.Set(count_only),
-            " counting only (don't materialize the result set)";
-(*          "-t", Arg.Set(time), "print timing statistics";
-            "-max-tc", Arg.Set_int(tc_threshold),
-            "set maximum count for which the TextCollection is used";
-*)
-             "-f", Arg.Set_int(sample_factor),
-            "<n> sample factor [default=64]";
-
-            "-i", Arg.Set(index_empty_texts),
-            " index empty texts [default=false]";
-            "-d", Arg.Set(disable_text_collection),
-            " disable text collection[default=false]";
-            "-s", Arg.Set_string(save_file),
-            "<save_file> save the intermediate representation into file.srx";
-            "-b", Arg.Set(bottom_up), " real bottom up run";
-            "-nj", Arg.Set(no_jump), " disable jumping";
-            "-index-type", Arg.Symbol ([ "default"; "swcsa"; "rlcsa" ], set_index_type),
-            " choose text index type";
-            "-v", Arg.Set(verbose), " verbose mode";
-          ]
+let spec = Arg.align
+  [ "-c", Arg.Set(count_only),
+    " counting only (don't materialize the result set)";
+
+    "-f", Arg.Set_int(sample_factor),
+    "<n> sample factor [default=64]";
+
+    "-i", Arg.Set(index_empty_texts),
+    " index empty texts [default=false]";
+
+    "-d", Arg.Set(disable_text_collection),
+    " disable text collection[default=false]";
+
+    "-s", Arg.Set_string(save_file),
+    "<save_file> save the intermediate representation into file.srx";
+
+    "-b", Arg.Set(bottom_up), " real bottom up run";
+
+    "-nj", Arg.Set(no_jump), " disable jumping";
+
+    "-index-type", Arg.Symbol ([ "default"; "swcsa"; "rlcsa" ],
+                              set_index_type),
+    " choose text index type";
+
+    "-v", Arg.Set(verbose), " verbose mode";
+  ]
 
 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
+  if (!pos > 3 || !pos < 2)
+  then begin Arg.usage spec usage_msg; exit 1 end