Matitaweb: Some bugfixes concerning file flags.

[helm.git] / matitaB / matita / matitaAuthentication.ml

diff --git a/matitaB/matita/matitaAuthentication.ml b/matitaB/matita/matitaAuthentication.ml
index d51eb2e4fae4a4ff7c0d2b0bb9ea508f049a7b3c..86189fddf6ec54c8a20995c2b952b7271470e73a 100644 (file)
--- a/matitaB/matita/matitaAuthentication.ml
+++ b/matitaB/matita/matitaAuthentication.ml
@@ -25,6 +25,8 @@
 
 type session_id = Uuidm.t
 
+type matita_file = MatitaFilesystem.matita_flag * string
+
 (* user table: user id, (password, optional session id) *)
 type user = string * (string * session_id option)
 
@@ -109,18 +111,54 @@ let deserialize () =
     user_tbl := Marshal.from_channel utbl_ch;
     close_in utbl_ch;
   with
-    | Sys_error _ -> user_tbl := []);
+    | Sys_error _ -> 
+       user_tbl := []; serialize());
   (* old_sessions are now invalid *)
   session_tbl := [];
 ;;
 
+let write_ft uid ft =
+  let ft_ch = open_out (config_path () ^ "/ft_" ^ uid ^ ".dump") in
+  Marshal.to_channel ft_ch ft [];
+  close_out ft_ch;
+;;
+
+let read_ft uid =
+  try
+    let ft_ch = open_in (config_path () ^ "/ft_" ^ uid ^ ".dump") in
+    let ft = Marshal.from_channel ft_ch in
+    close_in ft_ch;
+    ft
+  with
+    | Sys_error _ -> 
+      (* this is an error, we should rebuild the table by a diff of
+         the directory listing and svn stat *) 
+      [] 
+;;
+
+let set_file_flag uid filename flag =
+  let filename = MatitaFilesystem.normalize_qfn filename in 
+  let ft = read_ft uid in
+  let oldflag = 
+    try List.assoc filename ft
+    with Not_found -> MatitaFilesystem.MSynchronized
+  in
+  if oldflag <> MatitaFilesystem.MConflict 
+    then
+      let ft = (filename,flag)::
+        List.filter (fun (fn,_) -> fn <> filename) ft in
+      write_ft uid ft
+    else ()
+;;
+
 let add_user uid pw =
   try
     let _ = lookup_user uid in
     raise (UsernameCollision uid)
   with Not_found -> 
-    MatitaFilesystem.checkout uid;
+    let ft = MatitaFilesystem.checkout uid in
     user_tbl := (uid,(pw,None))::!user_tbl;
+    write_ft uid ft;
     serialize ()
 ;;