[BACK]Return to DBBean.java CVS log [TXT] [DIR] Up to [Repository] / FM2SQL

Diff for /FM2SQL/Attic/DBBean.java between versions 1.24 and 1.25

version 1.24, 2004/06/22 10:33:53 version 1.25, 2004/06/23 09:59:53
Line 13 Line 13
  * rogo     * rogo  
  */   */
   
   
 import java.sql.*;  import java.sql.*;
 import java.text.DateFormat;  import java.text.DateFormat;
 import java.text.ParseException;  import java.text.ParseException;
Line 199  public class DBBean Line 198  public class DBBean
     // Connect to the database      // Connect to the database
       connection = DriverManager.getConnection(url, prop);        connection = DriverManager.getConnection(url, prop);
       System.out.println("odbc with properties inited");        System.out.println("odbc with properties inited");
     }      } else
     else  
     connection = DriverManager.getConnection(url, user, passwd);      connection = DriverManager.getConnection(url, user, passwd);
     connectionPool.put(url, new ConnectionPool(url, user, passwd, connection));      connectionPool.put(url, new ConnectionPool(url, user, passwd, connection));
           
Line 710  public class DBBean Line 708  public class DBBean
   
     if (!connection.isClosed())      if (!connection.isClosed())
       stm = connection.createStatement();        stm = connection.createStatement();
     else {      else
             {
               
       try        try
       {        {
Line 725  public class DBBean Line 723  public class DBBean
     }      }
     stm.setMaxRows(numberOfHits);      stm.setMaxRows(numberOfHits);
     long time = System.currentTimeMillis();      long time = System.currentTimeMillis();
     try {      try
       {
     stm.execute(query);      stm.execute(query);
     long time2 = System.currentTimeMillis();      long time2 = System.currentTimeMillis();
         
Line 735  public class DBBean Line 734  public class DBBean
     result = stm.getResultSet();      result = stm.getResultSet();
    // System.out.println(result+" "+stm.getUpdateCount());     // System.out.println(result+" "+stm.getUpdateCount());
     metaData = result.getMetaData();      metaData = result.getMetaData();
     } catch(Exception e) {      } catch (Exception e)
       {
       // TODO remove        // TODO remove
       if(FM2SQL.fmInstance!=null)        if(FM2SQL.fmInstance!=null)
       FM2SQL.showErrorDialog("Error caught!! \n Query was  "+query+" \n","Debug Info");        FM2SQL.showErrorDialog("Error caught!! \n Query was  "+query+" \n","Debug Info");
Line 1415  public class DBBean Line 1415  public class DBBean
   
             } else              } else
               tableRow.addElement(null);                tableRow.addElement(null);
           }            } else
           else  
           {            {
             if(url.toLowerCase().indexOf("odbc")>=0)              if(url.toLowerCase().indexOf("odbc")>=0)
            {             {
Removed from v.1.24  
changed lines
  Added in v.1.25

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>