Added generation of HTML representation of the library.

[helm.git] / matitaB / matita / matitadaemon.ml
diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml

index 840442665e9c047806a9d05243587f3e345ad314..744034e060ba1c7c7f4c638584cbd865448a4861 100644 (file)
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -228,13 +228,22 @@ let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
    (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>");
+   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()
  ;;
  
@@ -242,17 +251,14 @@ 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
    
-  prerr_endline "1";
    assert (cgi#arguments <> []);
    let uid = cgi#argument_value "userid" in
    let userpw = cgi#argument_value "password" in
-  prerr_endline ("2: user = " ^ uid);
    let pw,_ = MatitaAuthentication.lookup_user uid in
-  prerr_endline "3";
  
    if pw = userpw then
     begin
-    prerr_endline "4";
+    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] (); *)
@@ -262,6 +268,7 @@ let login (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     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\""
@@ -492,7 +499,6 @@ let start() =
                  ; "logout", do_logout ]
        () in
    MatitaInit.initialize_all ();
-  prerr_endline (MatitaFilesystem.checkout "ricciott");
    MatitaAuthentication.deserialize ();
    Netplex_main.startup
      parallelizer