- use PxpHelmConf

- removed references to deprecated Pxp_yacc module

diff --git a/helm/ocaml/getter/Makefile b/helm/ocaml/getter/Makefile
index cc2519cfc693ae2281556a73e546ff7046373fc1..99529c2d4595d7e446deef39d3bd336956ff5f65 100644 (file)
--- a/helm/ocaml/getter/Makefile
+++ b/helm/ocaml/getter/Makefile
@@ -2,8 +2,8 @@
 PACKAGE = getter
 
 REQUIRES = \
-       http dbm pcre pxp shell zip \
-       helm-thread helm-logger helm-urimanager helm-registry
+       http dbm pcre shell zip \
+       helm-pxp helm-thread helm-logger helm-urimanager helm-registry
 
 INTERFACE_FILES = \
        clientHTTP.mli \

diff --git a/helm/ocaml/getter/http_getter.ml b/helm/ocaml/getter/http_getter.ml
index 0f20792d72bf634e7ced93d3ec172f262753e839..d9e95a1c280aa098a4e900c923f7953e05606ae2 100644 (file)
--- a/helm/ocaml/getter/http_getter.ml
+++ b/helm/ocaml/getter/http_getter.ml
@@ -221,8 +221,8 @@ let resolve_remote uri =
   (* deliver resolve request to http_getter *)
   let doc = ClientHTTP.get (sprintf "%sresolve?uri=%s" (getter_url ()) uri) in
   let res = ref Unknown in
-   Pxp_yacc.process_entity Pxp_yacc.default_config (`Entry_content [])
-    (Pxp_yacc.create_entity_manager ~is_document:true Pxp_yacc.default_config
+   Pxp_yacc.process_entity PxpHelmConf.pxp_config (`Entry_content [])
+    (Pxp_yacc.create_entity_manager ~is_document:true PxpHelmConf.pxp_config
      (Pxp_yacc.from_string doc))
     (function
       | Pxp_yacc.E_start_tag ("url",["value",url],_) -> res := Resolved url