X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FsearchEngine%2FsearchEngine.ml;h=c42c01043f081b01251b8566c73caf009abf8c2f;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=b7a699c2c993e0f38977d47879273f53117157d2;hpb=403c0a86bc67e674e5dc4a7ff822180d761a5159;p=helm.git

diff --git a/helm/searchEngine/searchEngine.ml b/helm/searchEngine/searchEngine.ml
index b7a699c2c..c42c01043 100644
--- a/helm/searchEngine/searchEngine.ml
+++ b/helm/searchEngine/searchEngine.ml
@@ -43,7 +43,7 @@ let placeholders = [
   "ACTION"; "ADVANCED"; "ADVANCED_CHECKED"; "CHOICES"; "CURRENT_CHOICES";
   "EXPRESSION"; "ID"; "IDEN"; "ID_TO_URIS"; "INTERPRETATIONS";
   "INTERPRETATIONS_LABELS"; "MSG"; "NEW_ALIASES"; "NEXT_LINK"; "NO_CHOICES";
-  "PAGE"; "PAGES"; "PREV_LINK"; "QUERY_KIND"; "QUERY_SUMMARY"; "RESULTS";
+  "PAGE"; "PAGES"; "PAGELIST"; "PREV_LINK"; "QUERY_KIND"; "QUERY_SUMMARY"; "RESULTS";
   "SEARCH_ENGINE_URL"; "SIMPLE_CHECKED"; "TITLE";
 ]
 
@@ -103,7 +103,8 @@ let javascript_quote s =
 let string_tail s =
   let len = String.length s in
   String.sub s 1 (len-1)
-let nonvar s =
+let nonvar uri =
+  let s = UriManager.string_of_uri uri in
   let len = String.length s in
   let suffix = String.sub s (len-4) 4 in
   not (suffix  = ".var")
@@ -145,8 +146,16 @@ let patch_param param_name param_value url =
   (** HTML encoding, e.g.: "<" -> "&lt;" *)
 let html_encode = Netencoding.Html.encode_from_latin1
 
+let fold_n_to_m f n m acc =
+ let rec aux acc =
+  function
+     i when i <= m -> aux (f i acc) (i + 1)
+   | _ -> acc
+ in
+  aux acc n
+
 let send_results results
-  ?(id_to_uris = CicTextualParser2.EnvironmentP3.of_string "") 
+  ?(id_to_uris = DisambiguateTypes.empty_environment) 
    (req: Http_types.request) outchan
   =
   let query_kind = query_kind_of_req req in
@@ -181,9 +190,28 @@ let send_results results
             results_no / results_per_page + 1
         in
         let pages = if pages = 0 then 1 else pages in
+        let additional_pages = 3 in
         let (summary, results) = MooglePp.theory_of_result page results in
         [ tag "PAGE", string_of_int page;
-          tag "PAGES", string_of_int pages;
+          tag "PAGES", string_of_int pages ^ " Pages";
+          tag "PAGELIST",
+          (let inf = page - additional_pages in
+           let sup = page + additional_pages in
+           let superinf = inf - (sup - pages) in
+           let supersup = sup + (1 - inf) in
+           let n,m =
+            if inf >= 1 && sup <= pages then
+             inf,sup
+            else if inf < 1 then
+             1, (if supersup <= pages then supersup else pages)
+            else (* sup > pages *)
+             (if superinf >= 1 then superinf else 1),pages
+           in
+            fold_n_to_m
+             (fun n acc -> acc ^ " " ^
+                          (if n = page then string_of_int n
+                           else page_link (string_of_int n) n))
+             n m "");
           tag "PREV_LINK", (if page > 1 then page_link "Prev" (page-1) else "");
           tag "NEXT_LINK",
             (if page < pages then page_link "Next" (page+1) else "");
@@ -192,7 +220,8 @@ let send_results results
           tag "RESULTS", results ]
     | `Error msg ->
         [ tag "PAGE", "1";
-          tag "PAGES", "1";
+          tag "PAGES", "1 Page";
+          tag "PAGELIST", "";
           tag "PREV_LINK", "";
           tag "NEXT_LINK", "";
           tag "QUERY_KIND", query_kind;
@@ -219,9 +248,7 @@ let send_results results
   in
   iter_file
     (fun line ->
-      let new_aliases =
-        CicTextualParser2.EnvironmentP3.to_string id_to_uris
-      in
+      let new_aliases = DisambiguatePp.pp_environment id_to_uris in
       let processed_line =
         apply_substs
           (* CSC: Bug here: this is a string, not an array! *)
@@ -255,14 +282,17 @@ let exec_action dbd (req: Http_types.request) outchan =
              | id::tail when id<>"" ->
                  (fun id' ->
                     if id = id' then
-                      Some (List.map (fun u -> Netencoding.Url.decode u) tail)
+                      Some (List.map 
+                        (fun u -> UriManager.uri_of_string
+                          (Netencoding.Url.decode u)) 
+                        tail)
                     else
                       f id')
              | _ -> failwith "Can't parse choices")
         (fun _ -> None)
         choices
     in
-    let id_to_uris = CicTextualParser2.EnvironmentP3.of_string id_to_uris_raw in
+    let id_to_uris = DisambiguatePp.parse_environment id_to_uris_raw in
     let id_to_choices =
       try
         parse_choices (req#param "choices")
@@ -279,7 +309,7 @@ let exec_action dbd (req: Http_types.request) outchan =
       struct
         let interactive_user_uri_choice ~selection_mode ?ok
           ?enable_button_for_non_vars ~(title: string) ~(msg: string)
-          ~(id: string) (choices: string list)
+          ~(id: string) (choices: UriManager.uri list)
         =
           match id_to_choices id with
           | Some choices -> choices
@@ -325,7 +355,7 @@ let exec_action dbd (req: Http_types.request) outchan =
       end
     in
     let module Disambiguate' = Disambiguate.Make(Chat) in
-    let ast = CicTextualParser2.parse_term (Stream.of_string term_str) in
+    let ast = Grammar.Entry.parse CicNotationParser.term (Stream.of_string term_str) in
     let (id_to_uris, metasenv, term) =
       match
         Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
@@ -351,12 +381,13 @@ let exec_action dbd (req: Http_types.request) outchan =
           let uri =
             match term with
             | Cic.MutInd (uri, typeno, _) ->
-                UriManager.string_of_uriref (uri, [typeno])
+                UriManager.uri_of_uriref uri typeno None 
             | _ -> raise Not_a_MutInd
           in
           MetadataQuery.elim ~dbd uri
       | _ -> assert false
     in
+    let uris = List.map UriManager.string_of_uri uris in
     send_results ~id_to_uris (`Results uris) req outchan
   with
   | Not_a_MutInd ->
@@ -412,6 +443,7 @@ let callback dbd (req: Http_types.request) outchan =
           send_results (`Results []) req outchan
         else begin
           let results = MetadataQuery.locate ~dbd expression in
+          let results = List.map UriManager.string_of_uri results in
           send_results (`Results results) req outchan
         end
     | "/hint"
@@ -426,7 +458,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
-  | CicTextualParser2.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
@@ -439,7 +471,7 @@ let callback dbd (req: Http_types.request) outchan =
 
 let restore_environment () =
   match
-    Helm_registry.get_opt Helm_registry.get "search_engine.environment_dump"
+    Helm_registry.get_opt Helm_registry.string "search_engine.environment_dump"
   with
   | None -> ()
   | Some fname ->
@@ -449,6 +481,10 @@ let restore_environment () =
       close_in ic;
       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 _ =
   printf "%s started and listening on port %d\n" daemon_name port;
   printf "Current directory is %s\n" (Sys.getcwd ());
@@ -463,6 +499,7 @@ let _ =
       ()
   in
   restore_environment ();
+  read_notation ();
   Http_daemon.start' ~port (callback dbd);
   printf "%s is terminating, bye!\n" daemon_name