X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-loader.lisp;h=f1493d3a1a585fb0d8c2d103d92a590f5d13b4c0;hp=0a3772100545acd83e544757ffc27081cca2dd6f;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=39bc32836bdf5bdab576ba1e4ef3762f46000b98

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 0a37721..f1493d3 100644
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -5,8 +5,6 @@
 ;;;; Name:          oracle-loader.lisp
 ;;;; Purpose:       Foreign library loader for CLSQL Oracle interface
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -16,16 +14,14 @@
 
 (in-package #:clsql-oracle)
 
-(defparameter *clsql-oracle-library-path* 
-  (uffi:find-foreign-library
-   "oracle"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/usr/lib/clsql/"
-     "/sw/lib/clsql/"
-     "/home/kevin/debian/src/clsql/db-oracle/")
-   :drive-letters '("C")))
+(defparameter *oracle-home*
+  (let ((oracle-home (getenv "ORACLE_HOME")))
+    (when oracle-home
+      (parse-namestring (concatenate 'string oracle-home "/"))))
+  "Pathname of ORACLE_HOME as set in user environment.")
 
-(defvar *oracle-library-candidate-drive-letters* '("C" "D" "E"))
+(defparameter *oracle-client-library-filenames*
+  (list "libclntsh" "oci"))
 
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -37,14 +33,21 @@ 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*)
-				      
+
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
-  (uffi:load-foreign-library *clsql-oracle-library-path* 
-			     :module "clsql-oracle" 
-			     :supporting-libraries *oracle-supporting-libraries*)
+  (when *oracle-home*
+    (dolist (dir-name '("lib" "bin"))
+      (dolist (lib-name '("libclntsh" "oci"))
+        (clsql:push-library-path
+         (make-pathname :name lib-name
+                        :directory (append (pathname-directory *oracle-home*)
+                                           (list dir-name)))))))
+
+  (clsql-uffi:find-and-load-foreign-library *oracle-client-library-filenames*
+                                            :module "clsql-oracle"
+                                            :supporting-libraries *oracle-supporting-libraries*)
   (setq *oracle-library-loaded* t))
 
-
 (clsql-sys:database-type-load-foreign :oracle)