[svn:dbd-oracle] r14893 - dbd-oracle/trunk

Author: yanick
Date: Sat Jul  2 15:05:29 2011
New Revision: 14893

Modified:
   dbd-oracle/trunk/Oracle.pm

Log:
Merge remote-tracking branch 'trunk' into rt67942-etc

Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm	(original)
+++ dbd-oracle/trunk/Oracle.pm	Sat Jul  2 15:05:29 2011
@@ -147,14 +147,18 @@
 	}
 
 	# get list of 'remote' database connection identifiers
-	my @tns_admin;
-	push @tns_admin, (
-	  "$oracle_home/network/admin",	# OCI 7 and 8.1
-	  "$oracle_home/net80/admin",	# OCI 8.0
-	) if $oracle_home;
+	my @tns_admin = ( DBD::Oracle::ora_env_var("TNS_ADMIN"), '.' );
+	push @tns_admin, map { join '/', $oracle_home, $_ }     
+                         'network/admin',	# OCI 7 and 8.1
+                         'net80/admin',	    # OCI 8.0
+	    if $oracle_home;
 	push @tns_admin, '/var/opt/oracle', '/etc';
-	foreach $d ( DBD::Oracle::ora_env_var("TNS_ADMIN"), ".", @tns_admin  ) {
-	    next unless $d && open(FH, "<$d/tnsnames.ora");
+
+    TNS_ADMIN:
+	foreach $d ( @tns_admin  ) {
+        next TNS_ADMIN unless $d and -f $d;
+	    open FH, '<', "$d/tnsnames.ora" or next TNS_ADMIN;
+
 	    $drh->trace_msg("Loading $d/tnsnames.ora\n") if $debug;
 	    local *_;
 	    while (<FH>) {