Revision 29932 branches/v2_0_0_prep/extensions/org.gvsig.oracle/src/org/gvsig/fmap/dal/store/oracle/OracleLibrary.java

View differences:

OracleLibrary.java
39 39
import org.slf4j.LoggerFactory;
40 40

  
41 41
/**
42
 * Oracle Spatial Library
42
 * Oracle Library
43 43
 * @author vsanjaime
44 44
 * 
45 45
 */
......
47 47
public class OracleLibrary extends BaseLibrary {
48 48

  
49 49
	private Logger logger = LoggerFactory.getLogger(OracleLibrary.class);
50
	
50 51
	static String DEFAULT_JDCB_DRIVER_NAME = "oracle.jdbc.OracleDriver";
51 52
	private static FeatureStore srsStore = null;
52 53

  
53 54
	/**
54
	 * Get jDBC connection url
55
	 * Get JDBC connection url
55 56
	 * 
56 57
	 * @param host
57 58
	 * @param port
58 59
	 * @param db
59 60
	 * @return
60 61
	 */
61
	public static String getJdbcUrl(String host, Integer port, String db) {
62
	public static String getJdbcUrl(String oraDriverType, String host, Integer port, String db) {
62 63
		String url;
63 64
		String sport = "";
64 65
		if (port != null) {
65 66
			sport = ":" + port;
66 67
		}
67
		url = OracleValues.CONN_STR_BEGIN + "@" + host + sport + ":"
68
		if(oraDriverType.compareToIgnoreCase("THIN")!=0 && oraDriverType.compareToIgnoreCase("OCI")!=0){
69
			oraDriverType = "THIN";
70
		}
71
		url = OracleValues.CONN_STR_BEGIN +oraDriverType+ ":@" + host + sport + ":"
68 72
				+ db;
69 73
		return url;
70 74
	}

Also available in: Unified diff