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

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 0a37721..7241402 100644
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -16,16 +16,30 @@
 
 (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-path* 
+    (uffi:find-foreign-library
+     '("libclntsh" "oci")
+     `(,@(when *load-truename*
+	   (list (make-pathname
+		  :directory (pathname-directory *load-truename*))))
+	 ,@(when *oracle-home*
+	     (list
+	      (make-pathname :defaults *oracle-home*
+			     :directory 
+			     (append (pathname-directory *oracle-home*)
+				     (list "lib")))
+	      (make-pathname :defaults *oracle-home*
+			     :directory 
+			     (append (pathname-directory *oracle-home*)
+				     (list "bin")))))
+	 "/usr/lib/oracle/10.1.0.2/client/lib/")
+     :drive-letters '("C")))
 
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -37,13 +51,16 @@ 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*)
-  (setq *oracle-library-loaded* t))
 
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
+  (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)