- changed license to lgpl

[helm.git] / helm / ocaml / tactics / metadataQuery.ml

diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml
index 4e6b31b537ce880232b591cccc3f9197bd8726dc..0a1f1ee441e939f22e9364b1806c626db1ada685 100644 (file)
--- a/helm/ocaml/tactics/metadataQuery.ml
+++ b/helm/ocaml/tactics/metadataQuery.ml
@@ -46,23 +46,13 @@ let nonvar s =
   let suffix = String.sub s (len-4) 4 in
   not (suffix  = ".var")
 
-let locate ~(dbd:Mysql.dbd) ?(vars = false) ?owner pat =
+let locate ~(dbd:Mysql.dbd) ?(vars = false) pat =
   let sql_pat = sqlpat_of_shellglob pat in
   let query =
-    match owner with
-    | None -> 
-        sprintf "SELECT source FROM %s WHERE value LIKE \"%s\""
-          MetadataTypes.name_tbl sql_pat
-    | Some owner -> 
-        sprintf "SELECT %s.source FROM %s,%s WHERE 
-                  (%s.source LIKE CONCAT(%s.source,\"#%%\") OR 
-                   %s.source = %s.source) AND
-                  value LIKE \"%s\" AND owner = \"%s\""
-          MetadataTypes.name_tbl
-          MetadataTypes.name_tbl MetadataTypes.owners_tbl
-          MetadataTypes.name_tbl MetadataTypes.owners_tbl
-          MetadataTypes.name_tbl MetadataTypes.owners_tbl
-          sql_pat owner
+        sprintf ("SELECT source FROM %s WHERE value LIKE \"%s\" UNION "^^
+                 "SELECT source FROM %s WHERE value LIKE \"%s\"")
+          (MetadataTypes.name_tbl ()) sql_pat
+           MetadataTypes.library_name_tbl sql_pat
   in
   let result = Mysql.exec dbd query in
   List.filter nonvar