X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fmain.ml;fp=helm%2Fhttp_getter%2Fmain.ml;h=f65e991b7c263fbd7a714e3efbd755684080a3c4;hb=72e5ddf0f07b0e692f5e3544438f77f2e346b12a;hp=47784d137ba4ba51d84b43bf747b14fd124177b8;hpb=989b06d74d4cf43b81e64e91ccaeadc8f935754a;p=helm.git diff --git a/helm/http_getter/main.ml b/helm/http_getter/main.ml index 47784d137..f65e991b7 100644 --- a/helm/http_getter/main.ml +++ b/helm/http_getter/main.ml @@ -29,6 +29,7 @@ open Printf open Http_getter_common +open Http_getter_const open Http_getter_misc open Http_getter_types @@ -89,22 +90,38 @@ let parse_rdf_class (req: Http_types.request) = | "backward" -> `Backward | c -> raise (Bad_request ("Invalid RDF class: " ^ c)) +let html_tag ?exn () = + let xml_decl = "\n" in + match exn with + | Some exn -> + sprintf + "%s\n" + xml_decl xhtml_ns helm_ns exn + | None -> + sprintf "%s\n" + xml_decl xhtml_ns helm_ns + let mk_return_fun pp_fun contype msg outchan = Http_daemon.respond ~body:(pp_fun msg) ~headers:["Content-Type", contype] outchan -let pp_error s = - sprintf "
Http Getter error: %s" s -let pp_internal_error s = - sprintf "Http Getter Internal error: %s" s -let pp_msg s = sprintf "%s" s +let pp_msg s = sprintf "%s%s" (html_tag ()) s let null_pp s = s -let return_html_error = mk_return_fun pp_error "text/html" -let return_html_internal_error = mk_return_fun pp_internal_error "text/html" -let return_html_msg = mk_return_fun pp_msg "text/html" -let return_html_raw = mk_return_fun null_pp "text/html" +let return_html_error exn = + let pp_error s = + sprintf "%s\nHttp Getter error: %s" + (html_tag ~exn ()) s + in + mk_return_fun pp_error "text/xml" +let return_html_internal_error exn = + let pp_internal_error s = + sprintf "%s\nHttp Getter Internal error: %s