version 1.15, 2004/04/15 11:13:59
|
version 1.18, 2004/05/06 11:39:42
|
Line 152 public class DBBean
|
Line 152 public class DBBean
|
ConnectionPool conPool = (ConnectionPool) connectionPool.get(url); |
ConnectionPool conPool = (ConnectionPool) connectionPool.get(url); |
if (conPool == null) |
if (conPool == null) |
{ |
{ |
connection = DriverManager.getConnection(url, user, passwd); |
createConnection(); |
connectionPool.put(url, new ConnectionPool(url, user, passwd, connection)); |
|
} else |
} else |
{ |
{ |
if (!conPool.user.equals(user) || !conPool.passwd.equals(passwd)) |
if (!conPool.user.equals(user) || !conPool.passwd.equals(passwd)) |
Line 167 public class DBBean
|
Line 167 public class DBBean
|
if (connection.isClosed()) |
if (connection.isClosed()) |
{ |
{ |
System.out.println("Made new connection!!!"); |
System.out.println("Made new connection!!!"); |
connection = DriverManager.getConnection(conPool.url, conPool.user, conPool.passwd); |
createConnection(); |
|
|
|
// connection = DriverManager.getConnection(conPool.url, conPool.user, conPool.passwd); |
conPool.con = connection; |
conPool.con = connection; |
} |
} |
} |
} |
if (url != "" && connection == null) |
if (url != "" && connection == null) |
connection = DriverManager.getConnection(url, user, passwd); |
createConnection(); |
|
//connection = DriverManager.getConnection(url, user, passwd); |
dbMetaData = connection.getMetaData(); |
dbMetaData = connection.getMetaData(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
if (quoteChar == null) |
if (quoteChar == null) |
Line 180 public class DBBean
|
Line 183 public class DBBean
|
|
|
return connection; |
return connection; |
} |
} |
|
private void createConnection() throws SQLException |
|
{ |
|
// setup the properties |
|
java.util.Properties prop = new java.util.Properties(); |
|
prop.put("charSet", "Cp1256"); |
|
prop.put("user", user); |
|
prop.put("password", passwd); |
|
System.out.println("url "+url); |
|
if(url.indexOf("odbc")>=0) |
|
{ |
|
// Connect to the database |
|
connection = DriverManager.getConnection(url, prop); |
|
System.out.println("odbc with properties inited"); |
|
} |
|
else |
|
connection = DriverManager.getConnection(url, user, passwd); |
|
connectionPool.put(url, new ConnectionPool(url, user, passwd, connection)); |
|
|
|
} |
/** |
/** |
* sets the connection of this DBBean to the database specified in the url |
* sets the connection of this DBBean to the database specified in the url |
* property |
* property |
Line 188 public class DBBean
|
Line 210 public class DBBean
|
{ |
{ |
this.url = url; |
this.url = url; |
if (url != "") |
if (url != "") |
connection = DriverManager.getConnection(url, user, passwd); |
//connection = DriverManager.getConnection(url, user, passwd); |
|
createConnection(); |
dbMetaData = connection.getMetaData(); |
dbMetaData = connection.getMetaData(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
if (quoteChar == null) |
if (quoteChar == null) |
Line 204 public class DBBean
|
Line 227 public class DBBean
|
this.passwd = passwd; |
this.passwd = passwd; |
this.url = url; |
this.url = url; |
if (url != "") |
if (url != "") |
connection = DriverManager.getConnection(url, user, passwd); |
createConnection(); |
|
// connection = DriverManager.getConnection(url, user, passwd); |
dbMetaData = connection.getMetaData(); |
dbMetaData = connection.getMetaData(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
quoteChar = dbMetaData.getIdentifierQuoteString(); |
if (quoteChar == null) |
if (quoteChar == null) |
Line 682 public class DBBean
|
Line 706 public class DBBean
|
} |
} |
stm.setMaxRows(numberOfHits); |
stm.setMaxRows(numberOfHits); |
long time = System.currentTimeMillis(); |
long time = System.currentTimeMillis(); |
|
try { |
stm.execute(query); |
stm.execute(query); |
|
} catch(Exception e) { |
|
// TODO remove |
|
// if(FM2SQL.fmInstance!=null) |
|
// FM2SQL.showErrorDialog("Error caught!! \n Query was "+query+" \n","Debug Info"); |
|
} |
long time2 = System.currentTimeMillis(); |
long time2 = System.currentTimeMillis(); |
|
|
System.out.println("time to execute "+(time2-time)); |
System.out.println("time to execute "+(time2-time)); |
Line 1282 public class DBBean
|
Line 1312 public class DBBean
|
date=date.replace('-','.'); |
date=date.replace('-','.'); |
java.text.DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,Locale.GERMAN); |
java.text.DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,Locale.GERMAN); |
java.util.Date d= dateFormat.parse(date); |
java.util.Date d= dateFormat.parse(date); |
Calendar cal=Calendar.getInstance(Locale.GERMAN); |
// Calendar cal=Calendar.getInstance(Locale.GERMAN); |
cal.setTime(d); |
// cal.setTime(d); |
date=(cal.get(Calendar.YEAR))+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DATE); |
// date=(cal.get(Calendar.YEAR))+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DATE); |
tableRow.addElement(java.sql.Date.valueOf(date)); |
tableRow.addElement(new java.sql.Date(d.getTime())); |
System.out.println(date); |
System.out.println("Date "+date); |
} |
} |
// m_columnClasses.addElement(java.sql.Date.class); |
// m_columnClasses.addElement(java.sql.Date.class); |
} else if (metaData.getColumnTypeName(i) == "NUMBER") |
} else if (metaData.getColumnTypeName(i) == "NUMBER") |
Line 1336 public class DBBean
|
Line 1366 public class DBBean
|
tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null); |
tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null); |
else |
else |
{ |
{ |
|
if(url.toLowerCase().indexOf("odbc")>=0) |
|
{ |
|
byte[] val = resultSet.getBytes(i); |
|
for(int j=0;j<val.length;++j) |
|
System.out.println(Integer.toHexString(val[j])); |
|
tableRow.addElement((val==null) ? null:new String(val)); |
|
|
|
} else |
// byte[] val = resultSet.getBytes(i); |
// byte[] val = resultSet.getBytes(i); |
tableRow.add(resultSet.getString(i)); |
tableRow.add(resultSet.getString(i)); |
//tableRow.addElement((val==null) ? null:new String(val,"UTF-8")); |
//tableRow.addElement((val==null) ? null:new String(val,"UTF-8")); |