removed some refinement_toolkit

[helm.git] / helm / software / components / library / libraryMisc.ml

diff --git a/helm/software/components/library/libraryMisc.ml b/helm/software/components/library/libraryMisc.ml
index 3f1931e42ce0e979e080c566381f47f572ddbdf8..e971c52d4b09cfe489ac27facb5e0c43729de748 100644 (file)
--- a/helm/software/components/library/libraryMisc.ml
+++ b/helm/software/components/library/libraryMisc.ml
@@ -25,14 +25,16 @@
 
 (* $Id$ *)
 
-let obj_file_of_baseuri ~basedir ~baseuri =
- let path = basedir ^ "/xml" ^ Pcre.replace ~pat:"^cic:" ~templ:"" baseuri in
-  path ^ ".moo"
+let resolve ~must_exist ~writable baseuri = 
+  if must_exist then 
+    Http_getter.resolve ~writable baseuri
+  else 
+    Http_getter.filename ~writable baseuri
 
-let lexicon_file_of_baseuri ~basedir ~baseuri =
- let path = basedir ^ "/xml" ^ Pcre.replace ~pat:"^cic:" ~templ:"" baseuri in
-  path ^ ".lexicon"
+let obj_file_of_baseuri ~must_exist ~writable ~baseuri = 
+  resolve ~must_exist ~writable baseuri ^ ".moo"
+let lexicon_file_of_baseuri ~must_exist ~writable ~baseuri = 
+  resolve ~must_exist ~writable baseuri ^ ".lexicon"
+let metadata_file_of_baseuri~must_exist ~writable  ~baseuri = 
+  resolve ~must_exist ~writable baseuri ^ ".metadata"
 
-let metadata_file_of_baseuri ~basedir ~baseuri =
- let path = basedir ^ "/xml" ^ Pcre.replace ~pat:"^cic:" ~templ:"" baseuri in
-  path ^ ".metadata"