X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_common.ml;h=ad549330b0c8dd1ade0d54ea3b448c01f21529cd;hb=1c7fb836e2af4f2f3d18afd0396701f2094265ff;hp=b7cbc936c57a17fa21e1f72366b975960e2ed7de;hpb=6a9be767a19f39aa862f989d8dbbe186b71db0ca;p=helm.git

diff --git a/helm/http_getter/http_getter_common.ml b/helm/http_getter/http_getter_common.ml
index b7cbc936c..ad549330b 100644
--- a/helm/http_getter/http_getter_common.ml
+++ b/helm/http_getter/http_getter_common.ml
@@ -34,9 +34,10 @@ let string_of_encoding = function
   | 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
 
@@ -46,14 +47,15 @@ let rec http_getter_uri_of_string = function
       | [ 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 =
@@ -97,7 +99,9 @@ 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_xml_raw = mk_return_fun null_pp "text/xml"
-let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
+let return_file
+  ~fname ?contype ?contenc ?(patch_fun = fun x -> x) ?(gunzip = false) outchan
+  =
   let headers =
     match (contype, contenc) with
     | (Some t, Some e) -> ["Content-Encoding", e; "Content-Type", t]
@@ -108,8 +112,26 @@ let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
   Http_daemon.send_basic_headers ~code:200 outchan;
   Http_daemon.send_headers headers outchan;
   Http_daemon.send_CRLF outchan;
-  Http_getter_misc.iter_file
-    (fun line -> output_string outchan (patch_fun line ^ "\n"))
-    fname
+  if gunzip then begin  (* gunzip needed, uncompress file, apply patch_fun to
+                        it, compress the result and sent it to client *)
+    let (tmp1, tmp2) =
+      (Http_getter_misc.tempfile (), Http_getter_misc.tempfile ())
+    in
+    Http_getter_misc.gunzip ~keep:true ~output:tmp1 fname;  (* gunzip to tmp1 *)
+    let new_file = open_out tmp2 in
+    Http_getter_misc.iter_file  (* tmp2 = patch(tmp1) *)
+      (fun line -> output_string new_file (patch_fun line ^ "\n"))
+      tmp1;
+    close_out new_file;
+    Http_getter_misc.gzip ~output:tmp1 tmp2;  (* tmp1 = gzip(tmp2); rm tmp2 *)
+    Http_getter_misc.iter_file  (* send tmp1 to client as is*)
+      (fun line -> output_string outchan (line ^ "\n"))
+      tmp1;
+    Sys.remove tmp1       (* rm tmp1 *)
+  end else  (* no need to gunzip, apply patch_fun directly to file *)
+    Http_getter_misc.iter_file
+      (fun line -> output_string outchan (patch_fun line ^ "\n"))
+      fname
+;;
 let return_400 body outchan = Http_daemon.respond_error ~code:400 ~body outchan