X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=c21bed2e7c25129d7130633062123f02dc1b8e22;hb=dc21a7ae8ac838b0967db8d65ca30724ae556a47;hp=18caa7426cc9d02b06855560b70712d452456f33;hpb=d2a3f16be6c74cc7d79198a6ed126103bb502aea;p=helm.git

diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index 18caa7426..c21bed2e7 100644
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -3,6 +3,12 @@ open Http_types;;
 
 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
+
 (*** from matitaScript.ml ***)
 (* let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" *)
 
@@ -25,8 +31,8 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   | GrafiteAst.Comment (loc, _) -> loc in
   
   let _,lend = HExtlib.loc_of_floc floc in 
-  let parsed_text, parsed_text_len = 
-    MatitaGtkMisc.utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in
+  let parsed_text, _parsed_text_len = 
+    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 
@@ -36,13 +42,23 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   let status = 
     MatitaEngine.eval_ast ~include_paths ~do_heavy_checks:false status ("",0,ast)
   in 
-  (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*) Glib.Utf8.length parsed_text
-
+  (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*)
+    utf8_length parsed_text
 
-let status = ref (new MatitaEngine.status "cic:/matita");;
-let history = ref [!status];;
+(*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 = ["/home/barolo/matitaB/matita/lib"];;
+let include_paths = ref [];;
 
 (* <metasenv>
  *   <meta number="...">
@@ -65,7 +81,7 @@ let output_status s =
   | Stack.Open i ->
       let meta = List.assoc i metasenv in
       snd (ApplyTransformation.ntxt_of_cic_sequent 
-        ~metasenv ~subst ~map_unicode_to_tex:false 80 s (i,meta))
+        ~metasenv ~subst ~map_unicode_to_tex:false !sequent_size s (i,meta))
   | Stack.Closed _ -> "This goal has already been closed."
   in
   let render_sequent is_loc acc depth tag (pos,sw) =
@@ -81,9 +97,11 @@ let output_status s =
          | _ -> 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      
@@ -114,18 +132,21 @@ let output_status s =
   String.concat "\n\n" txt
 ;; *)
 
-(* returns the length of the executed text and an html representation of the
- * current metasenv*)
-let advance text (* (?bos=false) *) =
-     let (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
-       (* try *)
-         eval_statement include_paths (*buffer*) !status (`Raw text)
-       (* with End_of_file -> raise Margin *)
-     in
-     status := st;
-     history := st :: !history;
-     let txt = output_status !status in
-     parsed_len, new_unparsed, 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*";;
@@ -138,33 +159,6 @@ let first_line s =
   with Not_found -> s
 ;;
 
-let gotoBottom =
-  let rec aux parsed_len metasenv text =
-    try
-      prerr_endline ("evaluating: " ^ first_line text);
-      let plen,new_unparsed,cur_metasenv = advance text in
-      aux (parsed_len+plen) cur_metasenv new_unparsed
-    with 
-    | End_of_file -> parsed_len, metasenv
-    | _ -> 
-       prerr_endline ("goto bottom debug: metasenv = \n" ^ metasenv);
-       parsed_len, metasenv
-  in aux 0 ""
-;;
-
-let retract () =
-  let new_history,new_status =
-     match !history with
-       _::(status::_ as history) ->
-        history, status
-    | [_] -> (prerr_endline "singleton";failwith "retract")
-    | _ -> (prerr_endline "nil"; assert false) in
-  NCicLibrary.time_travel !status;
-  history := new_history;
-  status := new_status;
-  output_status !status
-;;
-
 let read_file fname =
   let chan = open_in fname in
   let lines = ref [] in
@@ -191,134 +185,544 @@ let load_doc filename outchan =
   Http_daemon.respond ~headers:["Content-Type", contenttype] ~code:(`Code 200) ~body:s outchan
 ;;
 
-let call_service outchan =
-  try 
-   (ignore(MatitaEngine.assert_ng 
-     ~include_paths:["/home/barolo/matitaB/matita/lib"] (* ~outch:outchan *)
-    "/home/barolo/matitaB/matita/lib/basics/pts.ma");
-    prerr_endline "fatto";
-    let s = read_file "/home/barolo/matitaB/matita/lib/basics/pts.ma.mad"
-    in
-    Http_daemon.respond ~headers:["Content-Type", "text/html"] ~code:(`Code 200) ~body:s outchan
-   )
+let retrieve (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 uid = MatitaAuthentication.user_of_session sid in
+    (*
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    *)
+    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 ()
+        (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 = 
+          Librarian.baseuri_of_script ~include_paths:[] filename in 
+        let includes =
+         try
+          Str.split (Str.regexp " ") 
+           (List.assoc "include_paths" (Librarian.load_root_file (root^"/root")))
+         with Not_found -> []
+        in
+        let rc = root :: includes in
+         List.iter (HLog.debug) rc; baseuri, rc
+       with 
+         Librarian.NoRootFor _ | Librarian.FileNotFound _ -> "",[] in
+    include_paths := incpaths;
+    let status = MatitaAuthentication.get_status sid in
+    MatitaAuthentication.set_status sid (status#set_baseuri baseuri);
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string body;
   with
-  e -> Http_daemon.respond ~code:(`Code 500) outchan
+  | Not_found _ -> 
+    cgi # set_header
+      ~status:`Internal_server_error
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ());
+  cgi#out_channel#commit_work()
 ;;
 
-
-let callback req outchan =
-  let str = 
-    (sprintf "request path = %s\n"  req#path) ^
-    (sprintf "request GET params = %s\n"
-      (String.concat ";"
-        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params_GET))) ^
-    (sprintf "request POST params = %s\n"
-      (String.concat ";"
-        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params_POST))) ^
-    (sprintf "request ALL params = %s\n"
-      (String.concat ";"
-        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params))) ^
-    (sprintf "cookies = %s\n"
-      (match req#cookies with
-      | None ->
-          "NO COOKIES "
-          ^ (if req#hasHeader ~name:"cookie"
-             then "('Cookie:' header was '" ^ req#header ~name:"cookie" ^ "')"
-             else "(No 'Cookie:' header received)")
-      | Some cookies ->
-          (String.concat ";"
-            (List.map (fun (n,v) -> String.concat "=" [n;v]) cookies)))) ^
-    (sprintf "request BODY = '%s'\n\n" req#body)
-  in
-  (* Http_daemon.respond ~code:(`Code 200) ~body: str outchan *)
-
-  prerr_endline str;
-
-  match req#path with
-  | "/" -> load_index outchan
-  | "/matita" -> call_service outchan
-  | "/open" ->
-      prerr_endline "getting 'file' argument";
-      let filename = List.assoc "file" req#params_GET 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
-      let _,baseuri,_,_ = 
-        Librarian.baseuri_of_script ~include_paths:[] filename
-      in
-      status := (!status)#set_baseuri baseuri;
-      Http_daemon.respond ~code:(`Code 200) ~body outchan
-  | "/advance" ->
-      let script = req#body in
-      prerr_endline ("body length = " ^ (string_of_int (String.length script)));
-      let (parsed_len,_,txt), res, code =
-        try advance script, "OK", `Code 200
+let advance0 sid text =
+  let status = MatitaAuthentication.get_status sid in
+  let status = status#reset_disambiguate_db () in
+  let (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
+       try
+         eval_statement !include_paths (*buffer*) status (`Raw text)
         with 
-        | HExtlib.Localized(_,e) 
-        | e -> 
-                (prerr_endline ("exception: " ^ Printexc.to_string e);
-                (try 
-                  NTacStatus.pp_tac_status !status
-                with e -> prerr_endline ("inner exception: " ^
-                  Printexc.to_string e));
-                prerr_endline "end status";
-                let txt = output_status !status in
-                (0,"",txt), Printexc.to_string e, `Code 500)
-      in
-      (* prerr_endline ("server response:\n" ^ txt); *)
-      let body = 
-        "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
-        ^ "</response>"
-      in (prerr_endline ("sending advance response:\n" ^ body);
-         Http_daemon.respond ~code ~body outchan)
-  | "/bottom" ->
-      let script = req#body in
-      prerr_endline ("body length = " ^ (string_of_int (String.length script)));
-      let (parsed_len,txt), res, code =
-        try gotoBottom script, "OK", `Code 200
-        with 
-        | HExtlib.Localized(_,e) 
-        | e -> 
-                (prerr_endline ("exception: " ^ Printexc.to_string e);
-                (try 
-                  NTacStatus.pp_tac_status !status
-                with e -> prerr_endline ("inner exception: " ^
-                  Printexc.to_string e));
-                prerr_endline "end status";
-                let txt = output_status !status in
-                (0,txt), Printexc.to_string e, `Code 500)
-      in
-      (* prerr_endline ("server response:\n" ^ txt); *)
-      let body = 
-        "<parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt
-      in Http_daemon.respond ~code ~body outchan
-  | "/retract" ->
-      (try
-        let body = retract () in
-        prerr_endline "retract OK";
-        Http_daemon.respond ~code:(`Code 200) ~body outchan
-       with e -> 
-        (prerr_endline (Printexc.to_string e);
-         Http_daemon.respond ~code:(`Code 500) outchan))
-  | url -> 
-     try 
-       let url = String.sub url 1 (String.length url - 1) in
-       load_doc url outchan
-     with _ -> Http_daemon.respond_not_found ~url outchan  
+        | 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;
+  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
+  let env = cgi#environment in
+  
+  assert (cgi#arguments <> []);
+  let uid = cgi#argument_value "userid" in
+  let userpw = cgi#argument_value "password" in
+  (try 
+    MatitaAuthentication.add_user uid userpw;
+    env#set_output_header_field "Location" "/index.html"
+   with
+   | MatitaAuthentication.UsernameCollision _ ->
+      cgi#set_header
+       ~cache:`No_cache 
+       ~content_type:"text/html; charset=\"utf-8\""
+       ();
+     cgi#out_channel#output_string
+      "<html><head></head><body>Error: User id collision!</body></html>"
+   | MatitaFilesystem.SvnError msg ->
+      cgi#set_header
+       ~cache:`No_cache 
+       ~content_type:"text/html; charset=\"utf-8\""
+       ();
+     cgi#out_channel#output_string
+      ("<html><head></head><body><p>Error: Svn checkout failed!<p><p><textarea>"
+       ^ msg ^ "</textarea></p></body></html>"));
+  cgi#out_channel#commit_work()
+;;
+
+let login (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+  let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+  let env = cgi#environment in
+  
+  assert (cgi#arguments <> []);
+  let uid = cgi#argument_value "userid" in
+  let userpw = cgi#argument_value "password" in
+  let pw,_ = MatitaAuthentication.lookup_user uid in
+
+  if pw = userpw then
+   begin
+    let _ = MatitaFilesystem.html_of_library uid 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"
+   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\""
+      ();
+    cgi#out_channel#output_string
+      "<html><head></head><body>Authentication error</body></html>"
+   end;
+    
+  cgi#out_channel#commit_work()
+  
+;;
+
+let logout (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
+    MatitaAuthentication.logout_user sid;
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ();
+    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()
+;;
+
+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 filename = libdir uid ^ "/" ^ (cgi # argument_value "file") in
+    prerr_endline ("Matita will save the file for user " ^ uid);
+    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;
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<response>ok</response>"
+  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 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 = MatitaFilesystem.do_global_commit () in
+    prerr_endline ("commit errors: " ^ (String.concat " " errors));
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string "<response>ok</response>"
+  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()
+;;
+
+(* returns the length of the executed text and an html representation of the
+ * current metasenv*)
+let advance (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 text = cgi#argument_value "body" 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) ^ "\">" ^
+       new_parsed ^ "</parsed>" ^ txt 
+       ^ "</response>"
+    in 
+    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 _ -> 
+    cgi # set_header
+      ~status:`Internal_server_error
+      ~cache:`No_cache 
+      ~content_type:"text/xml; charset=\"utf-8\""
+      ());
+  cgi#out_channel#commit_work()
+;;
+
+let gotoBottom (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 history = MatitaAuthentication.get_history sid in
+
+    let rec aux parsed_len parsed_txt text =
+      try
+        prerr_endline ("evaluating: " ^ first_line text);
+        let plen,new_parsed,new_unparsed,_new_status = advance0 sid text in
+        aux (parsed_len+plen) (parsed_txt ^ new_parsed) new_unparsed
+      with 
+      | 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, 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) ^ "\">" ^
+       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 # 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\"" ());
+  cgi#out_channel#commit_work() 
 ;;
 
-let spec =
-  { Http_daemon.default_spec with
-      callback = callback;
-      port = 9999;
-      mode = `Single (*`Thread *) ;
-  }
+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
+  prerr_endline "executing retract";
+  (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
+         _::(status::_ as history) ->
+          history, status
+      | [_] -> (prerr_endline "singleton";failwith "retract")
+      | _ -> (prerr_endline "nil"; assert false) in
+    prerr_endline "before time_travel";
+    NCicLibrary.time_travel new_status;
+    prerr_endline "after 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));
+    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 
+      ~content_type:"text/xml; charset=\"utf-8\"" ());
+  cgi#out_channel#commit_work() 
 ;;
 
-let _ =
+
+let viewLib (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
+    (*
+    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
+    cgi # set_header 
+      ~cache:`No_cache 
+      ~content_type:"text/html; charset=\"utf-8\""
+      ();
+    cgi#out_channel#output_string
+      ((*
+       "<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>" *) );
+  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;;
+
+(**********************************************************************)
+(* Create the webserver                                               *)
+(**********************************************************************)
+
+
+let start() =
+  let (opt_list, cmdline_cfg) = Netplex_main.args() in
+
+  let use_mt = ref true in
+
+  let opt_list' =
+    [ "-mt", Arg.Set use_mt,
+      "  Use multi-threading instead of multi-processing"
+    ] @ opt_list in
+
+  Arg.parse 
+    opt_list'
+    (fun s -> raise (Arg.Bad ("Don't know what to do with: " ^ s)))
+    "usage: netplex [options]";
+  let parallelizer = 
+    if !use_mt then
+      Netplex_mt.mt()     (* multi-threading *)
+    else
+      Netplex_mp.mp() in  (* multi-processing *)
+(*
+  let adder =
+    { Nethttpd_services.dyn_handler = (fun _ -> process1);
+      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_advance =
+    { Nethttpd_services.dyn_handler = (fun _ -> advance);
+      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_retract =
+    { Nethttpd_services.dyn_handler = (fun _ -> retract);
+      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 goto_bottom =
+    { Nethttpd_services.dyn_handler = (fun _ -> gotoBottom);
+      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;
+      dyn_uri = None;                 (* not needed *)
+      dyn_translator = (fun _ -> ""); (* not needed *)
+      dyn_accept_all_conditionals = false;
+    } in
+  let do_register =
+    { Nethttpd_services.dyn_handler = (fun _ -> register);
+      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_login =
+    { Nethttpd_services.dyn_handler = (fun _ -> login);
+      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_logout =
+    { Nethttpd_services.dyn_handler = (fun _ -> logout);
+      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_viewlib =
+    { Nethttpd_services.dyn_handler = (fun _ -> viewLib);
+      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_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 nethttpd_factory = 
+    Nethttpd_plex.nethttpd_factory
+      ~handlers:[ "advance", do_advance
+                ; "retract", do_retract
+                ; "bottom", goto_bottom
+                ; "open", retrieve 
+                ; "register", do_register
+                ; "login", do_login 
+                ; "logout", do_logout 
+                ; "reset", do_resetlib
+                ; "viewlib", do_viewlib
+                ; "save", do_save
+                ; "commit", do_commit]
+      () in
   MatitaInit.initialize_all ();
-  Http_daemon.main spec
+  MatitaAuthentication.deserialize ();
+  Netplex_main.startup
+    parallelizer
+    Netplex_log.logger_factories   (* allow all built-in logging styles *)
+    Netplex_workload.workload_manager_factories (* ... all ways of workload management *)
+    [ nethttpd_factory ]           (* make this nethttpd available *)
+    cmdline_cfg
 ;;
+
+Sys.set_signal Sys.sigpipe Sys.Signal_ignore;
+start();;