dir reorganization

[helm.git] / helm / ocaml / lexicon / lexiconEngine.ml

diff --git a/helm/ocaml/lexicon/lexiconEngine.ml b/helm/ocaml/lexicon/lexiconEngine.ml
index ff186b1311edd573c9b2843bdba82fe2f326d062..aec759c964d64d3b3d00f9ea92d87c73d42a5445 100644 (file)
--- a/helm/ocaml/lexicon/lexiconEngine.ml
+++ b/helm/ocaml/lexicon/lexiconEngine.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 exception IncludedFileNotCompiled of string (* file name *)
 exception MetadataNotFound of string        (* file name *)
 
@@ -55,8 +57,7 @@ let add_metadata new_metadata status =
           | LibraryNoDb.Dependency buri ->
               if List.exists (LibraryNoDb.eq_metadata m) metadata
               then acc
-              else m :: acc
-          | _ -> m :: acc)
+              else m :: acc)
         metadata new_metadata
     in
     { status with metadata = metadata' }
@@ -108,7 +109,7 @@ let rec eval_command status cmd =
      let lexicon = LexiconMarshal.load_lexicon lexiconpath in
      let status = List.fold_left eval_command status lexicon in
       if Helm_registry.get_bool "db.nodb" then
-       let metadatapath = baseuri ^ ".metadata" in
+       let metadatapath = LibraryMisc.metadata_file_of_baseuri ~basedir ~baseuri in
         if not (Sys.file_exists metadatapath) then
           raise (MetadataNotFound metadatapath)
         else