half ported to the "new" module organization.

diff --git a/daemons/graphs/tools/Makefile b/daemons/graphs/tools/Makefile
index 0726670319c97eda7006eeeb0a78bc8d6a6aaabd..bef00fca356b88eba54d5fe30a6f9013028fdc21 100644 (file)
--- a/daemons/graphs/tools/Makefile
+++ b/daemons/graphs/tools/Makefile
@@ -6,8 +6,9 @@ SED=cat
 REQUIRES = http helm-registry
 PREDICATES = mt
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLFIND = OCAMLPATH=../../../components/METAS/ ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 EXECUTABLES = uriSetQueue drawGraph
 EXECUTABLES_OPT = $(patsubst %,%.opt,$(EXECUTABLES))
 

diff --git a/daemons/proofChecker/Makefile b/daemons/proofChecker/Makefile
index af48d0a5d1e941ec7d45a6831a6192fdb5be17c4..ae957785c958da96422ee92064ecfdebf25ef8b1 100644 (file)
--- a/daemons/proofChecker/Makefile
+++ b/daemons/proofChecker/Makefile
@@ -2,12 +2,13 @@ BIN_DIR = /usr/local/bin
 REQUIRES = helm-cic_proof_checking http
 PREDICATES =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) -g
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLFIND = OCAMLPATH=../../components/METAS/ ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS) -g
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep
 
-LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
-LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES = $(shell $(OCAMLFIND) query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES_OPT = $(shell $(OCAMLFIND) query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
 all: $(PROOFCHECKEROBJS) proofChecker
 opt: $(PROOFCHECKEROBJS:.cmo=.cmx) proofChecker.opt

diff --git a/daemons/rdfly/Makefile b/daemons/rdfly/Makefile
index 779bb7b44c9cc6de0424a91e78194128b3becbf6..87ef3be5f66c1335e9cb29531b961e2429b5923e 100644 (file)
--- a/daemons/rdfly/Makefile
+++ b/daemons/rdfly/Makefile
@@ -2,7 +2,7 @@ BIN_DIR = /usr/local/bin
 REQUIRES = mysql http helm-registry
 PREDICATES = 
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLFIND = ocamlfind
+OCAMLFIND = OCAMLPATH=../../components/METAS/ ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc -thread $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt -thread $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep -pp camlp4o

diff --git a/daemons/uwobo/Makefile b/daemons/uwobo/Makefile
index 00b578aca1add15e7366fddb55eef5d335dae969..dc571a6b9d7ca3db3754d7f84f63178da1e4507d 100644 (file)
--- a/daemons/uwobo/Makefile
+++ b/daemons/uwobo/Makefile
@@ -3,7 +3,7 @@ DISTDIR = uwobo-$(VERSION)
 DISTTARBALL = $(DISTDIR).tar.gz
 REQUIRES = http gdome2 gdome2-xslt pcre unix helm-registry
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLFIND = ocamlfind
+OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)

diff --git a/daemons/whelp/Makefile b/daemons/whelp/Makefile
index 2ae59df911656519f35efb5d880ec56672a44c1b..c57e6e1f364f5b53e949e2379bc73fb046e75b13 100644 (file)
--- a/daemons/whelp/Makefile
+++ b/daemons/whelp/Makefile
@@ -1,8 +1,9 @@
-REQUIRES = http helm-cic_textual_parser2 helm-logger helm-tactics
+REQUIRES = http helm-grafite_parser helm-logger helm-tactics helm-cic_disambiguation
 OCAMLOPTIONS = -thread -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamlfind ocamldep -package "$(REQUIRES)" -pp camlp4o
+OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "$(REQUIRES)" -pp camlp4o
 
 MODULES = mooglePp
 SRCS = $(patsubst %,%.ml,$(MODULES)) $(patsubst %,%.mli,$(MODULES)) \

diff --git a/daemons/whelp/mooglePp.ml b/daemons/whelp/mooglePp.ml
index 3af0afb4051f882f5251d44891ecc787c93cc232..026200b20be2ac78e57155cba5aaea4b793062b5 100644 (file)
--- a/daemons/whelp/mooglePp.ml
+++ b/daemons/whelp/mooglePp.ml
@@ -62,7 +62,7 @@ let html_of_interpretations interps =
     sprintf "<table>\n%s\n</table>"
       (String.concat "\n"
         (List.map
-           (fun (k, v) ->
+           (fun (_, k, v) ->
               sprintf "<tr><td><em>%s</em></td><td>%s</td></tr>" k v)
            interp))
   in

diff --git a/daemons/whelp/mooglePp.mli b/daemons/whelp/mooglePp.mli
index f3e2e595226e4c8ec7b7cbab3efc55a5c3413464..b01b504f2316e329b443eda221f1baca255ffa5a 100644 (file)
--- a/daemons/whelp/mooglePp.mli
+++ b/daemons/whelp/mooglePp.mli
@@ -31,5 +31,5 @@ val pp_error : string -> string -> string
   * QUERY_SUMMARY and QUERY_RESULTS tag in moogle's main template *)
 val theory_of_result : int -> string list -> string * string
 
-val html_of_interpretations: (string * string) list list -> string
+val html_of_interpretations: ('a * string * string) list list -> string
 

diff --git a/daemons/whelp/searchEngine.ml b/daemons/whelp/searchEngine.ml
index c42c01043f081b01251b8566c73caf009abf8c2f..26c1def3e60c6c7cbb4cd405829136993420f7b4 100644 (file)
--- a/daemons/whelp/searchEngine.ml
+++ b/daemons/whelp/searchEngine.ml
@@ -115,7 +115,7 @@ let add_param_substs params =
       let key' = (Pcre.extract ~pat:"param\\.(.*)" key).(1) in
       Pcre.regexp ("@" ^ key' ^ "@"), value)
     (List.filter
-      (fun ((key,_) as p) -> Pcre.pmatch ~pat:"^param\\." key)
+      (fun (key,_) -> Pcre.pmatch ~pat:"^param\\." key)
       params)
 
 let page_RE = Pcre.regexp "&param\\.page=\\d+"
@@ -155,7 +155,7 @@ let fold_n_to_m f n m acc =
   aux acc n
 
 let send_results results
-  ?(id_to_uris = DisambiguateTypes.empty_environment) 
+  ?(id_to_uris = DisambiguateTypes.Environment.empty) 
    (req: Http_types.request) outchan
   =
   let query_kind = query_kind_of_req req in
@@ -292,7 +292,9 @@ let exec_action dbd (req: Http_types.request) outchan =
         (fun _ -> None)
         choices
     in
-    let id_to_uris = DisambiguatePp.parse_environment id_to_uris_raw in
+    let id_to_uris,_ = 
+      CicNotation2.parse_environment id_to_uris_raw ~include_paths:[]
+    in
     let id_to_choices =
       try
         parse_choices (req#param "choices")
@@ -315,7 +317,7 @@ let exec_action dbd (req: Http_types.request) outchan =
           | Some choices -> choices
           | None -> List.filter nonvar choices
 
-        let interactive_interpretation_choice interpretations =
+        let interactive_interpretation_choice _ _ interpretations =
           match interpretation_choices with
           | Some l -> l
           | None ->
@@ -359,22 +361,21 @@ let exec_action dbd (req: Http_types.request) outchan =
     let (id_to_uris, metasenv, term) =
       match
         Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
-          ~aliases:id_to_uris ast
+          ~aliases:id_to_uris ~universe:None ("",0,ast)
       with
-      | [id_to_uris,metasenv,term,_] -> id_to_uris,metasenv,term
+      | [id_to_uris,metasenv,term,_], _ -> id_to_uris,metasenv,term
       | _ -> assert false
     in
     let uris =
       match req#path with
-      | "/match" -> MetadataQuery.match_term ~dbd term
-      | "/instance" -> MetadataQuery.instance ~dbd term
+      | "/match" -> Whelp.match_term ~dbd term
+      | "/instance" -> Whelp.instance ~dbd term
       | "/hint" ->
           let status = ProofEngineTypes.initial_status term metasenv in
           let intros = PrimitiveTactics.intros_tac () in
           let subgoals = ProofEngineTypes.apply_tactic intros status in
           (match subgoals with
           | proof, [goal] ->
-              let (uri,metasenv,bo,ty) = proof in
               List.map fst (MetadataQuery.experimental_hint ~dbd (proof, goal))
           | _ -> assert false)
       | "/elim" ->
@@ -384,10 +385,15 @@ let exec_action dbd (req: Http_types.request) outchan =
                 UriManager.uri_of_uriref uri typeno None 
             | _ -> raise Not_a_MutInd
           in
-          MetadataQuery.elim ~dbd uri
+          Whelp.elim ~dbd uri
       | _ -> assert false
     in
     let uris = List.map UriManager.string_of_uri uris in
+    let id_to_uris = 
+      List.fold_left 
+      (fun env (k,v) -> DisambiguateTypes.Environment.add k v env)
+        DisambiguateTypes.Environment.empty id_to_uris
+    in
     send_results ~id_to_uris (`Results uris) req outchan
   with
   | Not_a_MutInd ->
@@ -442,7 +448,7 @@ let callback dbd (req: Http_types.request) outchan =
         if expression = "" then
           send_results (`Results []) req outchan
         else begin
-          let results = MetadataQuery.locate ~dbd expression in
+          let results = Whelp.locate ~dbd expression in
           let results = List.map UriManager.string_of_uri results in
           send_results (`Results results) req outchan
         end
@@ -458,7 +464,7 @@ let callback dbd (req: Http_types.request) outchan =
   | Chat_unfinished -> ()
   | Http_types.Param_not_found attr_name ->
       bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
-  | CicNotationParser.Parse_error (_, msg) ->
+  | CicNotationParser.Parse_error msg ->
       send_results (`Error (MooglePp.pp_error "Parse error" msg)) req outchan
   | Unbound_identifier id ->
       send_results (`Error (MooglePp.pp_error "Unbound identifier" id)) req
@@ -482,9 +488,12 @@ let restore_environment () =
       printf "done!\n"; flush stdout
 
 let read_notation () =
- CicNotation.load_notation (Helm_registry.get "search_engine.notations");
- CicNotation.load_notation (Helm_registry.get "search_engine.interpretations")
-
+  let _ = assert false in ()
+  (*
+  CicNotation.load_notation (Helm_registry.get "search_engine.notations");
+  CicNotation.load_notation (Helm_registry.get "search_engine.interpretations")
+  *)
+  
 let _ =
   printf "%s started and listening on port %d\n" daemon_name port;
   printf "Current directory is %s\n" (Sys.getcwd ());
@@ -492,7 +501,7 @@ let _ =
   flush stdout;
   Unix.putenv "http_proxy" "";
   let dbd =
-    Mysql.quick_connect
+    HMysql.quick_connect
       ~host:(Helm_registry.get "db.host")
       ~database:(Helm_registry.get "db.database")
       ~user:(Helm_registry.get "db.user")