use PxpHelmConf module

diff --git a/helm/ocaml/registry/Makefile b/helm/ocaml/registry/Makefile
index 84e86ec19b159bfb396978cf41bc266ffdcbfbc0..e6a861689edf795259a3df3a5c8a1e40feecda80 100644 (file)
--- a/helm/ocaml/registry/Makefile
+++ b/helm/ocaml/registry/Makefile
@@ -1,6 +1,6 @@
 
 PACKAGE = registry
-REQUIRES = str netstring pxp unix
+REQUIRES = str netstring helm-pxp unix
 INTERFACE_FILES = helm_registry.mli
 IMPLEMENTATION_FILES = helm_registry.ml
 

diff --git a/helm/ocaml/registry/helm_registry.ml b/helm/ocaml/registry/helm_registry.ml
index 35273608ff25c826a7eecbf84b85d4c0dd442eb9..0c7b437238d1e57c23a9d5bcf73d83d6e4fde2b1 100644 (file)
--- a/helm/ocaml/registry/helm_registry.ml
+++ b/helm/ocaml/registry/helm_registry.ml
@@ -183,13 +183,13 @@ open Pxp_types
 open Pxp_yacc
 
 let save_to =
-  let dtd = new dtd default_config.warner `Enc_utf8 in
+  let dtd = new dtd PxpHelmConf.pxp_config.warner `Enc_utf8 in
   let dot_RE = Str.regexp "\\." in
   let create_key_node key value = (* create a <key name="foo">value</key> *)
     let element =
-      create_element_node ~valcheck:false default_spec dtd "key" ["name", key]
+      create_element_node ~valcheck:false PxpHelmConf.pxp_spec dtd "key" ["name", key]
     in
-    let data = create_data_node default_spec dtd value in
+    let data = create_data_node PxpHelmConf.pxp_spec dtd value in
     element#append_node data;
     element
   in
@@ -211,7 +211,7 @@ let save_to =
               find ~deeply:false (is_section section) node
             with Not_found ->
               let section_node =
-                create_element_node ~valcheck:false default_spec dtd
+                create_element_node ~valcheck:false PxpHelmConf.pxp_spec dtd
                   "section" ["name", section]
               in
               node#append_node section_node;
@@ -223,7 +223,7 @@ let save_to =
   in
   fun fname ->
     let xml_root =
-      create_element_node ~valcheck:false default_spec dtd "helm_registry" []
+      create_element_node ~valcheck:false PxpHelmConf.pxp_spec dtd "helm_registry" []
     in
     Hashtbl.iter
       (fun key value ->
@@ -250,7 +250,7 @@ let save_to =
       close_out outchan
 
 let load_from_absolute =
-  let config = default_config in
+  let config = PxpHelmConf.pxp_config in
   let entry = `Entry_document [ `Extend_dtd_fully; `Parse_xml_decl ] in
   let fold_key key_stack key =
     match key_stack with
@@ -260,7 +260,7 @@ let load_from_absolute =
   fun fname ->
     debug_print ("Loading configuration from " ^ fname);
     let document =
-      parse_wfdocument_entity config (from_file fname) default_spec
+      parse_wfdocument_entity config (from_file fname) PxpHelmConf.pxp_spec
     in
     let rec aux key_stack node =
       node#iter_nodes (fun n ->