new metadataTypes interface (with ownerize function)

[helm.git] / helm / ocaml / metadata / metadataDb.ml

diff --git a/helm/ocaml/metadata/metadataDb.ml b/helm/ocaml/metadata/metadataDb.ml
index df79118f2cb796dbc2233c9115c3b79e46ee3c9c..441609a1ddd4d0423afd6f8dc4cb70e2c5b0180c 100644 (file)
--- a/helm/ocaml/metadata/metadataDb.ml
+++ b/helm/ocaml/metadata/metadataDb.ml
@@ -29,16 +29,16 @@ open Printf
 
 let prepare_insert () =
   let insert_owner a b =
-    sprintf "INSERT %s VALUES (\"%s\", \"%s\")" owners_tbl a b
+    sprintf "INSERT %s VALUES (\"%s\", \"%s\")" (owners_tbl ())a b
   in
   let insert_sort  a b c d =
-    sprintf "INSERT %s VALUES (\"%s\", \"%s\", %d, \"%s\")" sort_tbl a b c d
+    sprintf "INSERT %s VALUES (\"%s\", \"%s\", %d, \"%s\")" (sort_tbl ())a b c d
   in
   let insert_rel a b c =
-    sprintf "INSERT %s VALUES (\"%s\", \"%s\", %d)" rel_tbl a b c
+    sprintf "INSERT %s VALUES (\"%s\", \"%s\", %d)" (rel_tbl ()) a b c
   in
   let insert_obj a b c d =
-    sprintf "INSERT %s VALUES (\"%s\", \"%s\", \"%s\", %s)" obj_tbl a b c d
+    sprintf "INSERT %s VALUES (\"%s\", \"%s\", \"%s\", %s)" (obj_tbl ()) a b c d
   in
   (insert_owner, insert_sort, insert_rel, insert_obj)
 
@@ -67,21 +67,21 @@ let execute_insert dbd (insert_owner, insert_sort, insert_rel, insert_obj)
 let insert_const_no dbd uri =
   let inconcl_no =
     sprintf "INSERT %s SELECT \"%s\", COUNT(DISTINCT h_occurrence) FROM %s WHERE (h_position=\"%s\" OR h_position=\"%s\") AND source LIKE \"%s%%\""
-      conclno_tbl uri obj_tbl inconcl_pos mainconcl_pos uri
+      (conclno_tbl ()) uri (obj_tbl ()) inconcl_pos mainconcl_pos uri
   in
   let concl_hyp =
     sprintf "INSERT %s
         SELECT \"%s\",COUNT(DISTINCT h_occurrence)
         FROM %s
         WHERE NOT (h_position=\"%s\") AND (source = \"%s\")"
-      conclno_hyp_tbl uri obj_tbl inbody_pos uri
+      (conclno_hyp_tbl ()) uri (obj_tbl ()) inbody_pos uri
   in
   ignore (Mysql.exec dbd inconcl_no);
   ignore (Mysql.exec dbd concl_hyp)
 
 let insert_name ~dbd ~uri ~name =
   let query =
-    sprintf "INSERT %s VALUES (\"%s\", \"%s\")" name_tbl uri name
+    sprintf "INSERT %s VALUES (\"%s\", \"%s\")" (name_tbl ()) uri name
   in
   ignore (Mysql.exec dbd query)
 
@@ -114,7 +114,7 @@ let index_inductive_def ~dbd =
 let clean ~(dbd:Mysql.dbd) ~owner =
   let owned_uris =  (* list of uris in list-of-columns format *)
     let query =
-      sprintf "SELECT source FROM %s WHERE owner = \"%s\"" owners_tbl owner
+      sprintf "SELECT source FROM %s WHERE owner = \"%s\"" (owners_tbl ()) owner
     in
     let result = Mysql.exec dbd query in
     Mysql.map result (fun cols ->
@@ -123,7 +123,9 @@ let clean ~(dbd:Mysql.dbd) ~owner =
       | None -> assert false)
   in
   let del_from tbl =
-    let query s = sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\"" tbl s in
+    let query s = 
+      sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\"" (tbl ()) s 
+    in
     List.iter
       (fun source_col -> ignore (Mysql.exec dbd (query source_col)))
       owned_uris