X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmetadata%2FmetadataConstraints.ml;h=25803dc5c6e6647fe88e1c9bc7e85a066501c2d5;hb=57ad518c58e0b9684c5ea696a359037bed18dbc9;hp=2c04562d81dcea898ccd3aaf27182ee845c3ace3;hpb=1fe616bda25a6208c4d19f61220e570c71bcc25a;p=helm.git

diff --git a/helm/ocaml/metadata/metadataConstraints.ml b/helm/ocaml/metadata/metadataConstraints.ml
index 2c04562d8..25803dc5c 100644
--- a/helm/ocaml/metadata/metadataConstraints.ml
+++ b/helm/ocaml/metadata/metadataConstraints.ml
@@ -94,7 +94,7 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
     let cur_tbl = tbln n in
     match metadata with
     | `Obj (uri, positions) ->
-        let tbl = MetadataTypes.obj_tbl in
+        let tbl = MetadataTypes.obj_tbl () in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           (sprintf "%s.h_occurrence = \"%s\"" cur_tbl uri) ::
@@ -105,7 +105,7 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
         in
         ((n+1), from, where)
     | `Rel positions ->
-        let tbl = MetadataTypes.rel_tbl in
+        let tbl = MetadataTypes.rel_tbl () in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           mk_positions positions cur_tbl ::
@@ -115,8 +115,8 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
         in
         ((n+1), from, where)
     | `Sort (sort, positions) ->
-        let tbl = MetadataTypes.sort_tbl in
-        let sort_str = MetadataPp.pp_sort sort in
+        let tbl = MetadataTypes.sort_tbl () in
+        let sort_str = CicPp.ppsort sort in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           (sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str) ::
@@ -129,10 +129,10 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
   in
   let (n,from,where) = List.fold_left add_constraint (0,[],[]) metadata in
   let (n,from,where) =
-    add_card_constr MetadataTypes.conclno_tbl (n,from,where) concl_card
+    add_card_constr (MetadataTypes.conclno_tbl ()) (n,from,where) concl_card
   in
   let (n,from,where) =
-    add_card_constr MetadataTypes.conclno_hyp_tbl (n,from,where) full_card
+    add_card_constr (MetadataTypes.conclno_hyp_tbl ()) (n,from,where) full_card
   in
   let from = String.concat ", " from in
   let where = String.concat " and " where in