X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql%2Fpostgresql-loader.cl;h=bfdf60dd44e0daf60bcf57ea9feaf98156cbe8c6;hb=bdd8c1a8287aec0c4538ad565e6f9e70c8f5ba2e;hp=46e84084ec96b425c49a0b64b29148da9cf5b407;hpb=23c90f6984637c53261d7f67b4cc3f6335f89a34;p=clsql.git

diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl
index 46e8408..bfdf60d 100644
--- a/interfaces/postgresql/postgresql-loader.cl
+++ b/interfaces/postgresql/postgresql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-loader.cl,v 1.6 2002/04/08 01:22:02 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.12 2002/05/27 17:19:30 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,24 +28,25 @@ set to the right path before compiling or loading the system.")
 (defvar *postgresql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-sys:database-type-library-loaded ((database-type
+(defmethod clsql-base-sys:database-type-library-loaded ((database-type
 						    (eql :postgresql)))
   *postgresql-library-loaded*)
 				      
-(defmethod clsql-sys:database-type-load-foreign ((database-type
+(defmethod clsql-base-sys:database-type-load-foreign ((database-type
 						  (eql :postgresql)))
-  (when
-      (uffi:load-foreign-library 
-       (uffi:find-foreign-library "libpq"
-				  '("/opt/postgresql/lib/" "/usr/local/lib/" 
-				    "/usr/lib/" "/postgresql/lib/"
-				    "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
-				    "/opt/pgsql/lib/pgsql")
-				  :drive-letters '("C" "D" "E"))
-       
-       :module "postgresql"
-       :supporting-libraries 
-       *postgresql-supporting-libraries*)
-    (setq *postgresql-library-loaded* t)))
+  (let ((libpath (uffi:find-foreign-library 
+		  "libpq"
+		  '("/opt/postgresql/lib/" "/usr/local/lib/" 
+		    "/usr/lib/" "/postgresql/lib/"
+		    "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
+		    "/opt/pgsql/lib/pgsql")
+		  :drive-letters '("C" "D" "E"))))
+    (if	(uffi:load-foreign-library libpath
+				   :module "postgresql"
+				   :supporting-libraries 
+				   *postgresql-supporting-libraries*)
+	(setq *postgresql-library-loaded* t)
+      (warn "Can't load PostgreSQL client library ~A" libpath))))
+
+(clsql-base-sys:database-type-load-foreign :postgresql)
 
-(clsql-sys:database-type-load-foreign :postgresql)