getter's revolution (now uses backend in ocaml/getter)

[helm.git] / helm / http_getter / main.ml

diff --git a/helm/http_getter/main.ml b/helm/http_getter/main.ml
index e6b9f6e02abbcc24caee56cbb83c564f5a522055..90f776df359e2ca9a1e1592b6c53293fd7f29a74 100644 (file)
--- a/helm/http_getter/main.ml
+++ b/helm/http_getter/main.ml
@@ -35,6 +35,8 @@ open Http_getter_debugger
 
   (* constants *)
 
+let configuration_file = "http_getter.conf.xml"
+
 let common_headers = [
   "Cache-Control", "no-cache";
   "Pragma", "no-cache";
@@ -122,7 +124,7 @@ let return_all_foo_uris doctype uris outchan =
 <%s>
 "
       doctype
-      Http_getter_env.my_own_url
+      (Lazy.force Http_getter_env.my_own_url)
       doctype
       doctype);
   List.iter
@@ -153,7 +155,7 @@ let return_ls xmluri fmt outchan =
   | Fmt_xml ->
       Buffer.add_string buf "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
       bprintf buf "<!DOCTYPE ls SYSTEM \"%s/getdtd?uri=ls.dtd\">\n"
-        Http_getter_env.my_own_url;
+        (Lazy.force Http_getter_env.my_own_url);
       Buffer.add_string buf "<ls>\n";
       List.iter
         (function
@@ -216,7 +218,9 @@ let callback (req: Http_types.request) outchan =
           ~patch:(parse_patch req) outchan
     | "/getdtd" ->
         Http_getter_cache.respond_dtd ~patch:(parse_patch req)
-          ~url:(Http_getter_env.dtd_dir ^ "/" ^ (req#param "uri")) outchan
+          ~url:(sprintf "%s/%s"
+            (Helm_registry.get "getter.dtd_dir") (req#param "uri"))
+          outchan
     | "/resolve" -> return_resolve (req#param "uri") outchan
     | "/register" ->
         Http_getter.register ~uri:(req#param "uri") ~url:(req#param "url");
@@ -227,7 +231,7 @@ let callback (req: Http_types.request) outchan =
     | "/update" ->
         Http_getter_env.reload (); (* reload servers list from servers file *)
         let log = Http_getter.update () in
-        return_html_msg (Ui_logger.html_of_html_msg log) outchan
+        return_html_msg (HelmLogger.html_of_html_msg log) outchan
     | "/list_servers" -> return_list_servers outchan
     | "/add_server" ->
         let name = req#param "url" in
@@ -235,7 +239,7 @@ let callback (req: Http_types.request) outchan =
         let log = Http_getter.add_server ~position name in
         return_html_msg
           (sprintf "Added server %s in position %d)<br />\n%s"
-            name position (Ui_logger.html_of_html_msg log))
+            name position (HelmLogger.html_of_html_msg log))
           outchan
     | "/remove_server" ->
         let position = parse_position req in
@@ -247,7 +251,7 @@ let callback (req: Http_types.request) outchan =
         in
         return_html_msg
           (sprintf "Removed server at position %d<br />\n%s"
-            position (Ui_logger.html_of_html_msg log))
+            position (HelmLogger.html_of_html_msg log))
           outchan
     | "/getalluris" -> return_all_xml_uris outchan
     | "/getallrdfuris" -> return_all_rdf_uris (parse_rdf_class req) outchan
@@ -279,13 +283,16 @@ let callback (req: Http_types.request) outchan =
     (* Main *)
 
 let main () =
+  Helm_registry.load_from configuration_file;
+  Http_getter_env.reload ();
   print_string (Http_getter_env.env_to_string ());
   flush stdout;
   at_exit Http_getter.close_maps;
   Sys.catch_break true;
   try
-    Http_daemon.start'
-      ~timeout:(Some 600) ~port:Http_getter_env.port ~mode:`Thread callback
+    Http_daemon.start' ~mode:`Thread
+      ~timeout:(Some 600) ~port:(Helm_registry.get_int "getter.port")
+      callback
   with Sys.Break -> ()  (* 'close_maps' already registered with 'at_exit' *)
 
 let _ = main ()