X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=95ff43b17f852704fec42989414cda56a10cfca7;hb=fd05d5ee6ec6b74a88f1b6f25319760b4c05ba7c;hp=cd7d71dc94033e42ef3cb255213143c4c7102531;hpb=1bc3859b556a1fa1ddfc83f51f93c17eba40eac7;p=helm.git

diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index cd7d71dc9..95ff43b17 100644
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -5,13 +5,9 @@ module Stack = Continuationals.Stack
 
 let rt_path () = Helm_registry.get "matita.rt_base_dir" 
 
-let utf8_length = Netconversion.ustring_length `Enc_utf8
+let libdir uid = (rt_path ()) ^ "/users/" ^ uid 
 
-let utf8_parsed_text s floc =
-  let start, stop = HExtlib.loc_of_floc floc in
-  let len = stop - start in
-  let res = Netconversion.ustring_sub `Enc_utf8 start len s in
-  res, String.length res
+let utf8_length = Netconversion.ustring_length `Enc_utf8
 
 (*** from matitaScript.ml ***)
 (* let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" *)
@@ -36,7 +32,7 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   
   let _,lend = HExtlib.loc_of_floc floc in 
   let parsed_text, _parsed_text_len = 
-    utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in
+    HExtlib.utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in
   let byte_parsed_text_len = String.length parsed_text in
   let unparsed_txt' = 
     String.sub unparsed_text byte_parsed_text_len 
@@ -49,6 +45,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 [];;
@@ -82,19 +89,17 @@ let output_status s =
     let markup = 
       if is_loc then
         (match depth, pos with
-         | 0, 0 -> "<B>" ^ (render_switch sw) ^ "</B>"
+         | 0, 0 -> "<span class=\"activegoal\">" ^ (render_switch sw) ^ "</span>"
          | 0, _ -> 
-            Printf.sprintf "<B>|<SUB>%d</SUB>: %s</B>" pos (render_switch sw)
+            Printf.sprintf "<span class=\"activegoal\">|<SUB>%d</SUB>: %s</span>" pos (render_switch sw)
          | 1, pos when Stack.head_tag s#stack = `BranchTag ->
-             Printf.sprintf "|<SUB>%d</SUB> : %s" pos (render_switch sw)
+             Printf.sprintf "<span class=\"passivegoal\">|<SUB>%d</SUB> : %s</span>" pos (render_switch sw)
          | _ -> render_switch sw)
       else render_switch sw
     in
-    prerr_endline "pippo1";
     let markup = 
       Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () markup in
     let markup = "<metaname>" ^ markup ^ "</metaname>" in
-    prerr_endline "pippo2";
     let sequent =
       Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () (sequent sw)
     in      
@@ -102,28 +107,25 @@ let output_status s =
     "<meta number=\"" ^ (string_of_int metano) ^ "\">" ^ markup ^
     txt0 ^ "</meta>" ^ acc
   in
-  let res = "<metasenv>" ^
+  "<metasenv>" ^
     (Stack.fold 
       ~env:(render_sequent true) ~cont:(render_sequent false) 
       ~todo:(render_sequent false) "" s#stack) ^
     "</metasenv>"
-  in 
-  prerr_endline ("sending metasenv:\n" ^ res); res
+  (* prerr_endline ("sending metasenv:\n" ^ res); res *)
 ;;
 
-(* let html_of_status s =
-  let _,_,metasenv,subst,_ = s#obj in
-  let txt = List.fold_left 
-    (fun acc (nmeta,_ as meta) ->
-       let txt0 = snd (ApplyTransformation.ntxt_of_cic_sequent 
-         ~metasenv ~subst ~map_unicode_to_tex:false 80 s meta)
-       in
-       prerr_endline ("### txt0 = " ^ txt0);
-      ("<B>Goal ?" ^ (string_of_int nmeta) ^ "</B>\n" ^ txt0)::acc)
-    [] metasenv
-  in
-  String.concat "\n\n" txt
-;; *)
+let html_of_matita 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
+  let res = Str.global_replace patt3 "&lt;" res in
+  let res = Str.global_replace patt2 ">" res in
+  let res = Str.global_replace patt1 "<" res in
+  res
+;;
 
 let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*";;
 
@@ -167,17 +169,22 @@ 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
-    prerr_endline ("reading file " ^ filename);
+    *)
+    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
-    prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
-    let body = "<file>" ^ body ^ "</file>" 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 = "<response><file>" ^ body ^ "</file></response>" in
     let baseuri, incpaths = 
       try 
         let root, baseuri, _fname, _tgt = 
@@ -193,30 +200,45 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
        with 
          Librarian.NoRootFor _ | Librarian.FileNotFound _ -> "",[] in
     include_paths := incpaths;
-    let status = MatitaAuthentication.get_status sid in
-    MatitaAuthentication.set_status sid (status#set_baseuri baseuri);
+    let status = (MatitaAuthentication.get_status sid)#set_baseuri baseuri in
+    let history = [status] in
+    MatitaAuthentication.set_status sid status;
+    MatitaAuthentication.set_history sid history;
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
     cgi#out_channel#output_string body;
   with
   | Not_found _ -> 
     cgi # set_header
       ~status:`Internal_server_error
       ~cache:`No_cache 
-      ~content_type:"text/xml; charset=\"utf-8\""
+      ~content_type:"text/html; charset=\"utf-8\""
       ());
   cgi#out_channel#commit_work()
 ;;
 
 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 ("baseuri after advance = " ^ st#baseuri);
+  (* 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
@@ -227,7 +249,10 @@ let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   let userpw = cgi#argument_value "password" in
   (try 
     MatitaAuthentication.add_user uid userpw;
-    env#set_output_header_field "Location" "/index.html"
+(*    env#set_output_header_field "Location" "/index.html" *)
+    cgi#out_channel#output_string
+     ("<html><head><meta http-equiv=\"refresh\" content=\"2;url=/login.html\">"
+     ^ "</head><body>Redirecting to login page...</body></html>")
    with
    | MatitaAuthentication.UsernameCollision _ ->
       cgi#set_header
@@ -258,17 +283,20 @@ let login (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
 
   if pw = userpw then
    begin
-    let _ = MatitaFilesystem.html_of_library uid in
+   let ft = MatitaAuthentication.read_ft uid in
+   let _ = MatitaFilesystem.html_of_library uid ft in
     let sid = MatitaAuthentication.create_session uid in
     (* let cookie = Netcgi.Cookie.make "session" (Uuidm.to_string sid) in
        cgi#set_header ~set_cookies:[cookie] (); *)
     env#set_output_header_field 
       "Set-Cookie" ("session=" ^ (Uuidm.to_string sid));
-    env#set_output_header_field "Location" "/index.html"
+(*    env#set_output_header_field "Location" "/index.html" *)
+    cgi#out_channel#output_string
+     ("<html><head><meta http-equiv=\"refresh\" content=\"2;url=/index.html\">"
+     ^ "</head><body>Redirecting to Matita page...</body></html>")
    end
   else
    begin
-    prerr_endline ("ERROR: received " ^ userpw ^ "but the password is " ^ pw);
     cgi#set_header
       ~cache:`No_cache 
       ~content_type:"text/html; charset=\"utf-8\""
@@ -295,6 +323,131 @@ let logout (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     let text = read_file (rt_path () ^ "/logout.html") in
     cgi#out_channel#output_string text
   with
+  | Not_found _ -> 
+    cgi # set_header
+      ~status:`Internal_server_error
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ());
+  cgi#out_channel#commit_work()
+;;
+
+exception File_already_exists;;
+
+let save (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  let env = cgi#environment in
+  (try 
+    let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+    let sid = HExtlib.unopt sid in
+    let status = MatitaAuthentication.get_status sid in
+    let uid = MatitaAuthentication.user_of_session sid in
+    assert (cgi#arguments <> []);
+    let locked = cgi#argument_value "locked" in
+    let unlocked = cgi#argument_value "unlocked" in
+    let dir = cgi#argument_value "dir" in
+    let rel_filename = cgi # argument_value "file" in
+    let filename = libdir uid ^ "/" ^ rel_filename in
+    let force = bool_of_string (cgi#argument_value "force") in
+
+    if ((not force) && (Sys.file_exists filename)) then 
+      raise File_already_exists;
+
+    if dir = "true" then
+      Unix.mkdir filename 0o744
+    else 
+     begin
+      let oc = open_out filename in
+      output_string oc (locked ^ unlocked);
+      close_out oc;
+      if MatitaEngine.eos status unlocked then
+       begin
+        (* prerr_endline ("serializing proof objects..."); *)
+        GrafiteTypes.Serializer.serialize 
+          ~baseuri:(NUri.uri_of_string status#baseuri) status;
+        (* prerr_endline ("adding to the commit queue..."); *)
+        MatitaFilesystem.add_user uid;
+        (* prerr_endline ("done."); *)
+       end;
+     end;
+    MatitaAuthentication.set_file_flag uid 
+      [rel_filename, Some MatitaFilesystem.MModified];
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<response>ok</response>"
+  with
+  | File_already_exists ->
+      cgi#out_channel#output_string "<response>cancelled</response>"
+  | Sys_error _ -> 
+    cgi # set_header
+      ~status:`Internal_server_error
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ()
+  | e ->
+      let estr = Printexc.to_string e in
+      cgi#out_channel#output_string ("<response>" ^ estr ^ "</response>"));
+  cgi#out_channel#commit_work()
+;;
+
+let initiate_commit (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  let env = cgi#environment in
+  (try
+    let errors,out = MatitaFilesystem.do_global_commit () in
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<commit>";
+    cgi#out_channel#output_string "<response>ok</response>";
+    cgi#out_channel#output_string "<details>" ^ out ^ "</details>";
+    cgi#out_channel#output_string "</commit>"
+  with
+  | Not_found _ -> 
+    cgi # set_header
+      ~status:`Internal_server_error
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ());
+  cgi#out_channel#commit_work()
+;;
+
+let svn_update (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  let env = cgi#environment in
+  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
+  (try
+    let files,anomalies,(added,conflict,del,upd,merged) = 
+      MatitaFilesystem.update_user uid 
+    in
+    let anomalies = String.concat "\n" anomalies in
+    let details = Printf.sprintf 
+      ("%d new files\n"^^
+       "%d deleted files\n"^^
+       "%d updated files\n"^^
+       "%d merged files\n"^^
+       "%d conflicting files\n\n" ^^
+       "Anomalies:\n%s") added del upd merged conflict anomalies
+    in
+    prerr_endline ("update details:\n" ^ details);
+    let details = 
+      Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () details
+    in
+    MatitaAuthentication.set_file_flag uid files;
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<update>";
+    cgi#out_channel#output_string "<response>ok</response>";
+    cgi#out_channel#output_string ("<details>" ^ details ^ "</details>");
+    cgi#out_channel#output_string "</update>";
+  with
   | Not_found _ -> 
     cgi # set_header
       ~status:`Internal_server_error
@@ -312,19 +465,28 @@ let advance (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
+    (*
     cgi # set_header 
       ~cache:`No_cache 
       ~content_type:"text/xml; charset=\"utf-8\""
       ();
+    *)
     let text = cgi#argument_value "body" in
-    prerr_endline ("body =\n" ^ text);
-    let parsed_len, new_unparsed, new_status = advance0 sid text in
+    (* prerr_endline ("body =\n" ^ text); *)
+    let history = MatitaAuthentication.get_history sid in
+    let parsed_len, new_parsed, new_unparsed, new_status = advance0 sid text in
+    MatitaAuthentication.set_history sid (new_status::history);
     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);
+    (* prerr_endline ("sending advance response:\n" ^ body); *)
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
     cgi#out_channel#output_string body
   with
   | Not_found _ -> 
@@ -342,29 +504,48 @@ let gotoBottom (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 history = MatitaAuthentication.get_history 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
-    in 
+      | End_of_file -> 
+          let status = MatitaAuthentication.get_status sid in
+          GrafiteTypes.Serializer.serialize 
+            ~baseuri:(NUri.uri_of_string status#baseuri) status;
+          if parsed_len > 0 then 
+            MatitaAuthentication.set_history sid (status::history);
+          parsed_len, parsed_txt
+      | _ -> parsed_len, parsed_txt
+    in
+    (* 
     cgi # set_header 
       ~cache:`No_cache 
       ~content_type:"text/xml; charset=\"utf-8\""
       ();
+    *)
     let text = cgi#argument_value "body" in
-    prerr_endline ("body =\n" ^ text);
-    let parsed_len = aux 0 text in
+    (* prerr_endline ("body =\n" ^ text); *)
+    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 
-    prerr_endline ("sending goto bottom response:\n" ^ body);
+    (*let body = 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       ^ "</response>"
+    in*) 
+    (* prerr_endline ("sending goto bottom response:\n" ^ body); *)
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
     cgi#out_channel#output_string body
    with Not_found -> cgi#set_header ~status:`Internal_server_error 
       ~cache:`No_cache 
@@ -372,16 +553,55 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   cgi#out_channel#commit_work() 
 ;;
 
+let gotoTop (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  let env = cgi#environment in
+  prerr_endline "executing goto Top";
+  (try 
+    let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+    let sid = HExtlib.unopt sid in
+    (*
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    *)
+    let status = MatitaAuthentication.get_status sid in
+    let uid = MatitaAuthentication.user_of_session sid in
+    let baseuri = status#baseuri in
+    let new_status = new MatitaEngine.status (Some uid) baseuri in
+    prerr_endline "gototop prima della time travel";
+    NCicLibrary.time_travel new_status;
+    prerr_endline "gototop dopo della time travel";
+    let new_history = [new_status] in 
+    MatitaAuthentication.set_history sid new_history;
+    MatitaAuthentication.set_status sid new_status;
+    NCicLibrary.time_travel new_status;
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<response>ok</response>"
+   with _ -> 
+     (cgi#set_header ~status:`Internal_server_error 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\"" ();
+      cgi#out_channel#output_string "<response>ok</response>"));
+  cgi#out_channel#commit_work() 
+;;
+
 let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
   let env = cgi#environment in
   (try 
     let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
     let sid = HExtlib.unopt sid in
+    (*
     cgi # set_header 
       ~cache:`No_cache 
       ~content_type:"text/xml; charset=\"utf-8\""
       ();
+    *)
     let history = MatitaAuthentication.get_history sid in
     let new_history,new_status =
        match history with
@@ -389,12 +609,17 @@ let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
           history, status
       | [_] -> (prerr_endline "singleton";failwith "retract")
       | _ -> (prerr_endline "nil"; assert false) in
+    prerr_endline ("prima della time travel");
     NCicLibrary.time_travel new_status;
+    prerr_endline ("dopo della time travel");
     MatitaAuthentication.set_history sid new_history;
     MatitaAuthentication.set_status sid new_status;
-    prerr_endline ("after retract history.length = " ^ 
-      string_of_int (List.length new_history));
+    prerr_endline ("baseuri after retract = " ^ new_status#baseuri);
     let body = output_status new_status in
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
     cgi#out_channel#output_string body
    with _ -> cgi#set_header ~status:`Internal_server_error 
       ~cache:`No_cache 
@@ -409,13 +634,20 @@ let viewLib (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
+    (*
     cgi # set_header 
       ~cache:`No_cache 
       ~content_type:"text/html; charset=\"utf-8\""
       ();
+    *)
     let uid = MatitaAuthentication.user_of_session sid in
     
-    let html = MatitaFilesystem.html_of_library uid in
+    let ft = MatitaAuthentication.read_ft uid in
+    let html = MatitaFilesystem.html_of_library uid ft in
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ();
     cgi#out_channel#output_string
       ((*
        "<html><head>\n" ^
@@ -424,10 +656,32 @@ let viewLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
        "<script src=\"treeview/xmlTree.js\" type=\"text/javascript\"></script>\n" ^
        "<body>\n" ^ *)
        html (* ^ "\n</body></html>" *) );
+    
+    let files,anomalies = MatitaFilesystem.stat_user uid in
+    let changed = HExtlib.filter_map 
+      (fun (n,fl) -> if (List.mem MatitaFilesystem.Modified fl) then Some n else None) files
+    in
+    let changed = String.concat "\n" changed in
+    let anomalies = String.concat "\n" anomalies in
+    prerr_endline ("Changed:\n" ^ changed ^ "\n\nAnomalies:\n" ^ anomalies);
   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;;
 
 (**********************************************************************)
@@ -484,6 +738,13 @@ let start() =
       dyn_translator = (fun _ -> ""); (* not needed *)
       dyn_accept_all_conditionals = false;
     } in
+  let goto_top =
+    { Nethttpd_services.dyn_handler = (fun _ -> gotoTop);
+      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 retrieve =
     { Nethttpd_services.dyn_handler = (fun _ -> retrieve);
       dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
@@ -519,17 +780,51 @@ 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 do_save =
+    { Nethttpd_services.dyn_handler = (fun _ -> save);
+      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 do_commit =
+    { Nethttpd_services.dyn_handler = (fun _ -> initiate_commit);
+      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 do_update =
+    { Nethttpd_services.dyn_handler = (fun _ -> svn_update);
+      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
       ~handlers:[ "advance", do_advance
                 ; "retract", do_retract
                 ; "bottom", goto_bottom
+                ; "top", goto_top
                 ; "open", retrieve 
                 ; "register", do_register
                 ; "login", do_login 
                 ; "logout", do_logout 
-                ; "viewlib", do_viewlib]
+                ; "reset", do_resetlib
+                ; "viewlib", do_viewlib
+                ; "save", do_save
+                ; "commit", do_commit
+		; "update", do_update]
       () in
   MatitaInit.initialize_all ();
   MatitaAuthentication.deserialize ();