bugfix in uri's: missing "/" added to baseuri's where necessary

[helm.git] / helm / software / helena / src / xml / xmlLibrary.ml

diff --git a/helm/software/helena/src/xml/xmlLibrary.ml b/helm/software/helena/src/xml/xmlLibrary.ml
index 5ca87bdfd69231a2ac266e461dba9259479cc97e..91225c336135384c73c48b60e492dfb0bb76714a 100644 (file)
--- a/helm/software/helena/src/xml/xmlLibrary.ml
+++ b/helm/software/helena/src/xml/xmlLibrary.ml
@@ -30,9 +30,9 @@ let ccs_name = "ccs.ldc"
 
 let ccs_root = "CCS"
 
-let home = "http://lambdadelta.info"
+let home = "http://lambdadelta.info/"
 
-let system = home ^ "/" ^ base ^ "/ld.dtd"
+let system = F.concat (F.concat home base) "ld.dtd"
 
 let xmlns = "xmlns", home
 
@@ -177,13 +177,13 @@ let nexts = function
    | l  -> "next", String.concat " " (List.rev_map next_map l)
 
 let export_csys s = 
-   let path = path_of_uri !G.xdir s.Q.uri in
+   let path = path_of_uri !G.xdir s.Q.buri in
    let _ = Sys.command (Printf.sprintf "mkdir -p %s" path) in
    let name = F.concat path (ccs_name ^ ext) in
    let och = open_out name in
    let out = output_string och in
    xml out "1.0" "UTF-8"; doctype out ccs_root system;
-   let attrs = [xmlns; uri s.Q.uri] in
+   let attrs = [xmlns; uri s.Q.buri] in
    let contents out tab =
       tag "ToPositive" [arity s.Q.tp; marks s.Q.tp] out tab;
       tag "ToOne" [arity s.Q.t1; marks s.Q.t1] out tab;