Critical bug finally found after a long chasing!!!

[helm.git] / helm / software / components / library / libraryDb.ml

diff --git a/helm/software/components/library/libraryDb.ml b/helm/software/components/library/libraryDb.ml
index 8c11f591f1ba0b22c47b7b628665da3b7706e364..d3e7e9831b39977da16e2ea1e40338d2b38fff6d 100644 (file)
--- a/helm/software/components/library/libraryDb.ml
+++ b/helm/software/components/library/libraryDb.ml
@@ -69,7 +69,8 @@ let clean_owner_environment () =
       List.iter
         (fun suffix ->
           try
-           HExtlib.safe_remove (Http_getter.resolve (uri ^ suffix))
+           HExtlib.safe_remove 
+             (Http_getter.resolve ~writable:true (uri ^ suffix))
           with Http_getter_types.Key_not_found _ -> ())
         [""; ".body"; ".types"])
     owned_uris;
@@ -91,12 +92,24 @@ let create_owner_environment () =
   let rel_tbl = MetadataTypes.rel_tbl () in
   let name_tbl =  MetadataTypes.name_tbl () in
   let count_tbl = MetadataTypes.count_tbl () in
+  let l_obj_tbl = MetadataTypes.library_obj_tbl  in
+  let l_sort_tbl = MetadataTypes.library_sort_tbl  in
+  let l_rel_tbl = MetadataTypes.library_rel_tbl  in
+  let l_name_tbl =  MetadataTypes.library_name_tbl  in
+  let l_count_tbl = MetadataTypes.library_count_tbl  in
   let tbls = [ 
     (obj_tbl,`RefObj) ; (sort_tbl,`RefSort) ; (rel_tbl,`RefRel) ;
-    (name_tbl,`ObjectName) ; (count_tbl,`Count) ] 
+    (name_tbl,`ObjectName) ; (count_tbl,`Count) ]
+  in
+  let system_tbls = [ 
+    (l_obj_tbl,`RefObj) ; (l_sort_tbl,`RefSort) ; (l_rel_tbl,`RefRel) ;
+    (l_name_tbl,`ObjectName) ; (l_count_tbl,`Count) ] 
   in
   let statements = 
-    (SqlStatements.create_tables tbls) @ (SqlStatements.create_indexes tbls)
+    (SqlStatements.create_tables system_tbls) @ 
+    (SqlStatements.create_tables tbls) @ 
+    (SqlStatements.create_indexes system_tbls) @
+    (SqlStatements.create_indexes tbls)
   in
   List.iter (fun statement -> 
     try
@@ -130,7 +143,7 @@ let remove_uri uri =
   let dbd = instance () in
   let suri = UriManager.string_of_uri uri in 
   let query table suri = sprintf 
-    "DELETE FROM %s WHERE source LIKE '%s%%'" table (HMysql.escape suri)
+    "DELETE QUICK LOW_PRIORITY FROM %s WHERE source='%s'" table (HMysql.escape suri)
   in
   List.iter (fun t -> 
     try 
@@ -139,19 +152,7 @@ let remove_uri uri =
       exn -> raise exn (* no errors should be accepted *)
     )
   [obj_tbl;sort_tbl;rel_tbl;name_tbl;(*conclno_tbl;conclno_hyp_tbl*)count_tbl];
-  (* and now the debug job *)  
-  let dbg_q = 
-    sprintf "SELECT source FROM %s WHERE h_occurrence LIKE '%s%%'" obj_tbl
-    (HMysql.escape suri)
-  in
-  try 
-    let rc = HMysql.exec dbd dbg_q in
-    let l = ref [] in
-    HMysql.iter rc (fun a -> match a.(0) with None ->()|Some a -> l := a:: !l);
-    let l = List.sort Pervasives.compare !l in
-    HExtlib.list_uniq l
-  with
-    exn -> raise exn (* no errors should be accepted *)
+;;
 
 let xpointers_of_ind uri =
   let dbd = instance () in