moved hmysql to a separate module

diff --git a/helm/ocaml/extlib/.depend b/helm/ocaml/extlib/.depend
index e4598cb4ff6d7736aa3920b432e1e49bd6e79478..cbb3fcdfe98e0015849f65bcd229188f6e536c7e 100644 (file)
--- a/helm/ocaml/extlib/.depend
+++ b/helm/ocaml/extlib/.depend
@@ -1,4 +1,2 @@
 hExtlib.cmo: hExtlib.cmi 
 hExtlib.cmx: hExtlib.cmi 
-hMysql.cmo: hExtlib.cmi hMysql.cmi 
-hMysql.cmx: hExtlib.cmx hMysql.cmi 

diff --git a/helm/ocaml/extlib/Makefile b/helm/ocaml/extlib/Makefile
index 936bf3b21184aff18a0352decea262bf6781371f..d05af7c02548f22cefbd6ba1b43d8dd4b067bbc4 100644 (file)
--- a/helm/ocaml/extlib/Makefile
+++ b/helm/ocaml/extlib/Makefile
@@ -1,10 +1,9 @@
 PACKAGE = extlib
-REQUIRES = unix mysql
+REQUIRES = unix 
 PREDICATES =
 
 INTERFACE_FILES = \
-        hExtlib.mli \
-        hMysql.mli
+        hExtlib.mli 
 IMPLEMENTATION_FILES = \
        $(INTERFACE_FILES:%.mli=%.ml)
 EXTRA_OBJECTS_TO_INSTALL =

diff --git a/helm/ocaml/extlib/hMysql.ml b/helm/ocaml/extlib/hMysql.ml
deleted file mode 100644 (file)
index 77d788e..0000000
--- a/helm/ocaml/extlib/hMysql.ml
+++ /dev/null
@@ -1,57 +0,0 @@
-(* Copyright (C) 2000, HELM Team.
- * 
- * This file is part of HELM, an Hypertextual, Electronic
- * Library of Mathematics, developed at the Computer Science
- * Department, University of Bologna, Italy.
- * 
- * HELM is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * HELM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HELM; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA  02111-1307, USA.
- * 
- * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
- *)
-
-type dbd = Mysql.dbd
-type result = Mysql.result
-type error_code = Mysql.error_code
-
-let profiler = HExtlib.profile "mysql"
-
-let quick_connect ?host ?database ?port ?password ?user () =
- profiler.HExtlib.profile
-  (Mysql.quick_connect ?host ?database ?port ?password ?user) ()
-
-let disconnect dbd =
- profiler.HExtlib.profile Mysql.disconnect dbd
-
-let escape s =
- profiler.HExtlib.profile Mysql.escape s
-
-let exec dbd s =
- profiler.HExtlib.profile (Mysql.exec dbd) s
-
-let map res ~f =
- let map f = Mysql.map res ~f in
- profiler.HExtlib.profile map f
-
-let iter res ~f =
- let iter f = Mysql.iter res ~f in
- profiler.HExtlib.profile iter f
-
-let errno dbd =
- profiler.HExtlib.profile Mysql.errno dbd
-
-let status dbd =
- profiler.HExtlib.profile Mysql.status dbd

diff --git a/helm/ocaml/extlib/hMysql.mli b/helm/ocaml/extlib/hMysql.mli
deleted file mode 100644 (file)
index df8ac0b..0000000
--- a/helm/ocaml/extlib/hMysql.mli
+++ /dev/null
@@ -1,48 +0,0 @@
-(* Copyright (C) 2000, HELM Team.
- * 
- * This file is part of HELM, an Hypertextual, Electronic
- * Library of Mathematics, developed at the Computer Science
- * Department, University of Bologna, Italy.
- * 
- * HELM is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * HELM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HELM; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA  02111-1307, USA.
- * 
- * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
- *)
-
-type dbd
-type result
-
-(* the exceptions raised are from the Mysql module *)
-
-val quick_connect :
-  ?host:string ->
-  ?database:string ->
-  ?port:int -> ?password:string -> ?user:string -> unit -> dbd
-
-val disconnect : Mysql.dbd -> unit
-
-val escape: string -> string
-
-val exec: dbd -> string -> result
-
-val map : result -> f:(string option array -> 'a) -> 'a list
-
-val iter : result -> f:(string option array -> unit) -> unit
-
-val errno : dbd -> Mysql.error_code
-
-val status : dbd -> Mysql.status