X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=5d745eab776b420d377610685122b75ca3e3af13;hb=d8bc6fd4ab18f2995624c75e2889318237e9c17f;hp=72211bf5fcf29d5e5a12432a3b4520545dee5b36;hpb=b51d9a90c74c4c96c3335bb81b5b300c310916ba;p=helm.git

diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index 72211bf5f..5d745eab7 100644
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -5,6 +5,8 @@ module Stack = Continuationals.Stack
 
 let rt_path () = Helm_registry.get "matita.rt_base_dir" 
 
+let libdir uid = (rt_path ()) ^ "/users/" ^ uid 
+
 let utf8_length = Netconversion.ustring_length `Enc_utf8
 
 let utf8_parsed_text s floc =
@@ -49,6 +51,17 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*)
     utf8_length parsed_text
 
+(*let save_moo status = 
+  let script = MatitaScript.current () in
+  let baseuri = status#baseuri in
+  match script#bos, script#eos with
+  | true, _ -> ()
+  | _, true ->
+     GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri)
+      status
+  | _ -> clean_current_baseuri status 
+;;*)
+    
 let sequent_size = ref 40;;
 
 let include_paths = ref [];;
@@ -125,6 +138,23 @@ let output_status s =
   String.concat "\n\n" txt
 ;; *)
 
+let html_of_matita s =
+  prerr_endline ("input: " ^ s);
+  let patt1 = Str.regexp "\005" in
+  let patt2 = Str.regexp "\006" in
+  let patt3 = Str.regexp "<" in
+  let patt4 = Str.regexp ">" in
+  let res = Str.global_replace patt4 "&gt;" s in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt3 "&lt;" res in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt2 ">" res in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt1 "<" res in
+  prerr_endline ("output: " ^ res);
+  res
+;;
+
 let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*";;
 
 let first_line s =
@@ -167,17 +197,20 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   (try 
     let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
     let sid = HExtlib.unopt sid in
+    let uid = MatitaAuthentication.user_of_session sid in
     cgi # set_header 
       ~cache:`No_cache 
       ~content_type:"text/xml; charset=\"utf-8\""
       ();
-    let filename = cgi # argument_value "file" in
+    let filename = libdir uid ^ "/" ^ (cgi # argument_value "file") in
     prerr_endline ("reading file " ^ filename);
     let body = 
-      Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () 
-        (read_file filename) in
+     Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false ()
+        (html_of_matita (read_file filename)) in
+     
+     (*   html_of_matita (read_file filename) in *)
     prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
-    let body = "<file>" ^ body ^ "</file>" in
+    let body = "<response><file>" ^ body ^ "</file></response>" in
     let baseuri, incpaths = 
       try 
         let root, baseuri, _fname, _tgt = 
@@ -209,14 +242,24 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
 let advance0 sid text =
   let status = MatitaAuthentication.get_status sid in
   let history = MatitaAuthentication.get_history sid in
+  let status = status#reset_disambiguate_db () in
   let (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
-       (* try *)
+       try
          eval_statement !include_paths (*buffer*) status (`Raw text)
-       (* with End_of_file -> raise Margin *)
+        with 
+        | HExtlib.Localized (_,e) -> raise e
+        (*| End_of_file -> raise Margin *)
      in
+  let stringbuf = Ulexing.from_utf8_string new_statements in
+  let interpr = GrafiteDisambiguate.get_interpr st#disambiguate_db in
+  let outstr = ref "" in
+  ignore (SmallLexer.mk_small_printer interpr outstr stringbuf);
+  prerr_endline ("parser output: " ^ !outstr);
   MatitaAuthentication.set_status sid st;
   MatitaAuthentication.set_history sid (st::history);
-  parsed_len, new_unparsed, st
+  parsed_len, 
+    Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false 
+      () (html_of_matita !outstr), new_unparsed, st
 
 let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
@@ -318,10 +361,11 @@ let advance (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
       ();
     let text = cgi#argument_value "body" in
     prerr_endline ("body =\n" ^ text);
-    let parsed_len, new_unparsed, new_status = advance0 sid text in
+    let parsed_len, new_parsed, new_unparsed, new_status = advance0 sid text in
     let txt = output_status new_status in
     let body = 
-       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\">" ^
+       new_parsed ^ "</parsed>" ^ txt 
        ^ "</response>"
     in 
     prerr_endline ("sending advance response:\n" ^ body);
@@ -343,13 +387,18 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
     let sid = HExtlib.unopt sid in
 
-    let rec aux parsed_len text =
+    let rec aux parsed_len parsed_txt text =
       try
         prerr_endline ("evaluating: " ^ first_line text);
-        let plen,new_unparsed,_new_status = advance0 sid text in
-        aux (parsed_len+plen) new_unparsed
+        let plen,new_parsed,new_unparsed,_new_status = advance0 sid text in
+        aux (parsed_len+plen) (parsed_txt ^ new_parsed) new_unparsed
       with 
-      | _ -> parsed_len
+      | End_of_file -> 
+          let status = MatitaAuthentication.get_status sid in
+          GrafiteTypes.Serializer.serialize 
+            ~baseuri:(NUri.uri_of_string status#baseuri) status;
+          parsed_len, parsed_txt
+      | _ -> parsed_len, parsed_txt
     in 
     cgi # set_header 
       ~cache:`No_cache 
@@ -357,13 +406,18 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
       ();
     let text = cgi#argument_value "body" in
     prerr_endline ("body =\n" ^ text);
-    let parsed_len = aux 0 text in
+    let parsed_len, new_parsed = aux 0 "" text in
     let status = MatitaAuthentication.get_status sid in
     let txt = output_status status in
     let body = 
-       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\">" ^
+       new_parsed ^ "</parsed>" ^ txt 
        ^ "</response>"
     in 
+    (*let body = 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       ^ "</response>"
+    in*) 
     prerr_endline ("sending goto bottom response:\n" ^ body);
     cgi#out_channel#output_string body
    with Not_found -> cgi#set_header ~status:`Internal_server_error 
@@ -417,15 +471,31 @@ let viewLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     
     let html = MatitaFilesystem.html_of_library uid in
     cgi#out_channel#output_string
-      ("<html><head>\n" ^
+      ((*
+       "<html><head>\n" ^
        "<title>XML Tree Control</title>\n" ^
        "<link href=\"treeview/xmlTree.css\" type=\"text/css\" rel=\"stylesheet\">\n" ^
        "<script src=\"treeview/xmlTree.js\" type=\"text/javascript\"></script>\n" ^
-       "<body>\n" ^ html ^ "\n</body></html>");
+       "<body>\n" ^ *)
+       html (* ^ "\n</body></html>" *) );
   cgi#out_channel#commit_work()
   
 ;;
 
+let resetLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  MatitaAuthentication.reset ();
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ();
+    
+    cgi#out_channel#output_string
+      ("<html><head>\n" ^
+       "<title>Matitaweb Reset</title>\n" ^
+       "<body><H1>Reset completed</H1></body></html>");
+    cgi#out_channel#commit_work()
+
 open Netcgi1_compat.Netcgi_types;;
 
 (**********************************************************************)
@@ -517,6 +587,13 @@ let start() =
       dyn_translator = (fun _ -> ""); (* not needed *)
       dyn_accept_all_conditionals = false;
     } in 
+  let do_resetlib =
+    { Nethttpd_services.dyn_handler = (fun _ -> resetLib);
+      dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+      dyn_uri = None;                 (* not needed *)
+      dyn_translator = (fun _ -> ""); (* not needed *)
+      dyn_accept_all_conditionals = false;
+    } in 
   
   let nethttpd_factory = 
     Nethttpd_plex.nethttpd_factory
@@ -527,6 +604,7 @@ let start() =
                 ; "register", do_register
                 ; "login", do_login 
                 ; "logout", do_logout 
+                ; "reset", do_resetlib
                 ; "viewlib", do_viewlib]
       () in
   MatitaInit.initialize_all ();