X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=c78be251be819bf2277bee4909e81be1d0862b76;hb=bdd8c1a8287aec0c4538ad565e6f9e70c8f5ba2e;hp=408beba1d3f89b755499c3259f51dc417666d84d;hpb=da7a9d71f5424ad017be7fd1c4ca17aaffa91b2a;p=clsql.git

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index 408beba..c78be25 100644
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.9 2002/05/14 16:10:55 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.20 2002/07/09 19:15:16 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,10 +28,12 @@
 (defvar *clsql-mysql-library-filename* 
   (uffi:find-foreign-library
    "clsql-mysql"
-   `(,(translate-logical-pathname 
-       "CL-LIBRARY:clsql;interfaces;clsql-uffi;")
-     "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")))
-
+   `(,(directory-namestring
+       (translate-logical-pathname 
+	"CL-LIBRARY:clsql;interfaces;mysql;"))
+     "/usr/lib/clsql/")
+   :drive-letters '("C" "D" "E" "F" "G")))
+  
 (defvar *mysql-library-filename*
     (cond
      ((probe-file "/opt/mysql/lib/mysql/libmysqlclient.so")
@@ -63,10 +65,10 @@ set to the right path before compiling or loading the system.")
 (defvar *mysql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql)))
+(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :mysql)))
   *mysql-library-loaded*)
 				      
-(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :mysql)))
   (let ((mysql-path
 	 (uffi:find-foreign-library *mysql-library-candidate-names*
 				    *mysql-library-candidate-directories*
@@ -76,8 +78,7 @@ set to the right path before compiling or loading the system.")
     (uffi:load-foreign-library 
      (uffi:find-foreign-library '("libz" "zlib")
 				'("/usr/lib/" "/usr/local/" "/lib/")))
-    (when
-	(and
+    (if	(and
 	 (uffi:load-foreign-library mysql-path
 				    :module "mysql" 
 				    :supporting-libraries 
@@ -86,11 +87,10 @@ set to the right path before compiling or loading the system.")
 				    :module "clsql-mysql" 
 				    :supporting-libraries 
 				    (append *mysql-supporting-libraries*)))
-      (setq *mysql-library-loaded* t))))
+	(setq *mysql-library-loaded* t)
+      (warn "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
+	    mysql-path *clsql-mysql-library-filename*))))
+
 
+(clsql-base-sys:database-type-load-foreign :mysql)
 
-(clsql-sys:database-type-load-foreign :mysql)
-(when (clsql-sys:database-type-library-loaded :mysql)
-  (clsql-sys:initialize-database-type :database-type :mysql)
-  (setq clsql:*default-database-type* :mysql)
-  (pushnew :mysql cl:*features*))