| Enc_normal -> "Normal"
| Enc_gzipped -> "GZipped"
-let is_cic_uri uri = Pcre.pmatch ~pat:"^cic:" uri
+let is_cic_obj_uri uri = Pcre.pmatch ~pat:"^cic:" uri
let is_theory_uri uri = Pcre.pmatch ~pat:"^theory:" uri
-let is_xml_uri uri = is_cic_uri uri || is_theory_uri uri
+let is_cic_uri uri = is_cic_obj_uri uri || is_theory_uri uri
+let is_nuprl_uri uri = Pcre.pmatch ~pat:"^nuprl:" uri
let is_rdf_uri uri = Pcre.pmatch ~pat:"^helm:rdf(.*):(.*)//(.*)" uri
let is_xsl_uri uri = Pcre.pmatch ~pat:"^\\w+\\.xsl" uri
+let is_blank_line =
+ let blank_line_RE = Pcre.regexp "(^#)|(^\\s*$)" in
+ fun line ->
+ Pcre.pmatch ~rex:blank_line_RE line
+
let rec http_getter_uri_of_string = function
| uri when is_rdf_uri uri ->
(match Pcre.split ~pat:"//" uri with
| [ prefix; uri ] ->
let rest =
match http_getter_uri_of_string uri with
- | Xml_uri xmluri -> xmluri
+ | Cic_uri xmluri -> xmluri
| _ -> raise (Http_getter_invalid_URI uri)
in
Rdf_uri (prefix, rest)
| _ -> raise (Http_getter_invalid_URI uri))
- | uri when is_cic_uri uri -> Xml_uri (Cic (Pcre.replace ~pat:"^cic:" uri))
+ | uri when is_cic_uri uri -> Cic_uri (Cic (Pcre.replace ~pat:"^cic:" uri))
+ | uri when is_nuprl_uri uri -> Nuprl_uri (Pcre.replace ~pat:"^nuprl:" uri)
| uri when is_theory_uri uri ->
- Xml_uri (Theory (Pcre.replace ~pat:"^theory:" uri))
+ Cic_uri (Theory (Pcre.replace ~pat:"^theory:" uri))
| uri -> raise (Http_getter_invalid_URI uri)
let patch_xml line =
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_xml_msg = mk_return_fun null_pp "text/xml"
+let return_html_raw = mk_return_fun null_pp "text/html"
+let return_xml_raw = mk_return_fun null_pp "text/xml"
let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
let headers =
match (contype, contenc) with