fixed two preblems in matitadep, one coming from the dep-parser and

[helm.git] / components / library / librarian.ml

diff --git a/components/library/librarian.ml b/components/library/librarian.ml
index 9a16e814d56527354b66d4e8d5d5bdc6477795a3..cc3c96999453a8e88d1b42560c550acc347f3a0e 100644 (file)
--- a/components/library/librarian.ml
+++ b/components/library/librarian.ml
@@ -38,10 +38,11 @@ let remove_trailing_slash s =
 let load_root_file rootpath =
   let data = HExtlib.input_file rootpath in
   let lines = Str.split (Str.regexp "\n") data in
+  let clean s = Pcre.replace ~pat:"^ *" (Pcre.replace ~pat:" *$" s) in
   List.map 
     (fun l -> 
       match Str.split (Str.regexp "=") l with
-      | [k;v] -> Pcre.replace ~pat:"^ *" k, Pcre.replace ~pat:" *$" v
+      | [k;v] -> clean k, Http_getter_misc.strip_trailing_slash (clean v)
       | _ -> raise (Failure ("Malformed root file: " ^ rootpath)))
     lines
 ;;
@@ -51,7 +52,7 @@ let find_root_for ~include_paths file =
  try 
    let path = HExtlib.find_in include_paths file in
    let path = absolutize path in
-   (* HLog.debug ("file "^file^" resolved as "^path); *)
+(*     HLog.debug ("file "^file^" resolved as "^path);  *)
    let rootpath, root, buri = 
      try
        let mburi = Helm_registry.get "matita.baseuri" in
@@ -64,12 +65,13 @@ let find_root_for ~include_paths file =
        let buri = List.assoc "baseuri" (load_root_file rootpath) in
        rootpath, Filename.dirname rootpath, buri
    in
-   (* HLog.debug ("file "^file^" rooted by "^rootpath^""); *)
+(*     HLog.debug ("file "^file^" rooted by "^rootpath^"");  *)
    let uri = Http_getter_misc.strip_trailing_slash buri in
    if String.length uri < 5 || String.sub uri 0 5 <> "cic:/" then
      HLog.error (rootpath ^ " sets an incorrect baseuri: " ^ buri);
    ensure_trailing_slash root, remove_trailing_slash uri, path
  with Failure "find_in" -> 
+   HLog.error ("We are in: " ^ Sys.getcwd ());
    HLog.error ("Unable to find: "^file^"\nPaths explored:");
    List.iter (fun x -> HLog.error (" - "^x)) include_paths;
    raise (NoRootFor file)