mathql query generator interface patched

[helm.git] / helm / ocaml / mathql_test / mqgtop.ml

diff --git a/helm/ocaml/mathql_test/mqgtop.ml b/helm/ocaml/mathql_test/mqgtop.ml
index 35aca18c48db32f4c715e7b7c1e76e6944bf7aca..be35ac6c874586a74d165989c8722599cf85b265 100644 (file)
--- a/helm/ocaml/mathql_test/mqgtop.ml
+++ b/helm/ocaml/mathql_test/mqgtop.ml
@@ -170,7 +170,7 @@ let mpattern n m l =
         let oo, ool = if level land 1 = 0 then None, 0 else Some om, oml in
         let ro, rol = if level land 2 = 0 then None, 0 else Some rm, rml in
          let so, sol = if level land 4 = 0 then None, 0 else Some sm, sml in
-        let q = MQG.searchPattern (om,rm,sm) (oo,ro,so) in 
+        let q = MQG.query_of_constraints None (om,rm,sm) (oo,ro,so) in 
         if not (List.mem q ! queries) then
         begin
            issue handle q;
@@ -254,14 +254,14 @@ let prerr_help () =
    prerr_endline "-x  -execute            issues a query given in the input file";
    prerr_endline "-i  -interp FILE        sets the CIC short names interpretation file";
    prerr_endline "-d  -disply             outputs the CIC terms given in the input file";
-   prerr_endline "-C  -compose            issues the \"Compose\" query reading its specifications";
-   prerr_endline "                        from the input file";
    prerr_endline "-L  -locate ALIAS       issues the \"Locate\" query for the given alias";
+(*   prerr_endline "-C  -compose            issues the \"Compose\" query reading its specifications";
+   prerr_endline "                        from the input file"; 
    prerr_endline "-B  -backward LEVEL     issues the \"Backward\" query for the given level on all";
    prerr_endline "                        CIC terms in the input file";
    prerr_endline "-MB -multi-backward MAX issues the \"Backward\" query for each level from max to 0";
    prerr_endline "                        on all CIC terms in the input file";
-   prerr_endline "-P  -pattern LEVEL      issues the \"Pattern\" query for the given level on all";
+*)   prerr_endline "-P  -pattern LEVEL      issues the \"Pattern\" query for the given level on all";
    prerr_endline "                        CIC terms in the input file";
    prerr_endline "-MP -multi-pattern      issues the \"Pattern\" query for each level from 7 to 0";
    prerr_endline "                        on all CIC terms in the input file\n";
@@ -281,6 +281,7 @@ let rec parse = function
    | ("-o"|"-options") :: arg :: rem -> int_options := arg; parse rem
    | ("-c"|"-check") :: rem -> check (); parse rem
    | ("-l"|"-log-file") :: arg :: rem -> log_file := arg; parse rem
+   | ("-L"|"-Locate") :: arg :: rem -> locate arg; parse rem
 (*   | ("-C"|"-compose") :: rem -> compose (); parse rem   
    | ("-M"|"-backward") :: arg :: rem ->
       let m = (int_of_string arg) in mbackward m m (get_terms ()); parse rem