r9476: 25 May 2004 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-oracle / oracle-loader.lisp

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index d9259e0ad9213b22acc3ca833784ba354b18e5c2..6d91e8dc1847faeb1ec10ea88d9ad01b3cd32250 100644 (file)
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -17,27 +17,22 @@
 (in-package #:clsql-oracle)
 
 (defparameter *oracle-lib-path*
-    (let ((oracle-home (getenv "ORACLE_HOME")))
-      (when oracle-home
-       (make-pathname :directory 
-                      (append 
-                       (pathname-directory
-                        (parse-namestring (concatenate 'string oracle-home "/")))
+  (let ((oracle-home (getenv "ORACLE_HOME")))
+    (when oracle-home
+      (make-pathname :directory 
+                    (append 
+                     (pathname-directory
+                      (parse-namestring (concatenate 'string oracle-home "/")))
                        (list "lib"))))))
 
-(defparameter *clsql-oracle-library-path* 
+(defparameter *oracle-client-library-path* 
     (uffi:find-foreign-library
-     '("libclntsh" "oracle") 
+     "libclntsh"
      `(,@(when *load-truename* (list (make-pathname :directory (pathname-directory *load-truename*))))
        ,@(when *oracle-lib-path* (list *oracle-lib-path*))
-       "/9i/lib/"
-       "/usr/lib/clsql/"
-       "/sw/lib/clsql/"
-       "/home/kevin/debian/src/clsql/db-oracle/")
+       "/usr/lib/oracle/10.1.0.2/client/lib/")
      :drive-letters '("C")))
 
-(defvar *oracle-library-candidate-drive-letters* '("C" "D" "E"))
-
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
 load the Oracle client library succesfully.  If this differs at your site,
@@ -49,17 +44,15 @@ set to the right path before compiling or loading the system.")
 (defmethod clsql-sys:database-type-library-loaded ((database-type (eql :oracle)))
   *oracle-library-loaded*)
 
-(setf *oracle-lib-path* #p"/usr/lib/oracle/10.1.0.2/client/lib/")
-
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
-  #+ignore
-  (uffi:load-foreign-library
-   (make-pathname :defaults *oracle-lib-path* :name "libclntsh" :type "so"))
-  (uffi:load-foreign-library *clsql-oracle-library-path* 
-                            :module "clsql-oracle" 
-                            :supporting-libraries *oracle-supporting-libraries*)
-  (setq *oracle-library-loaded* t))
-
+  (if (pathnamep *oracle-client-library-path*) 
+      (progn
+       (uffi:load-foreign-library *oracle-client-library-path*
+                                  :module "clsql-oracle"
+                                  :supporting-libraries 
+                                  *oracle-supporting-libraries*)
+       (setq *oracle-library-loaded* t))
+      (warn "Unable to load oracle client library.")))
 
 (clsql-sys:database-type-load-foreign :oracle)