--- FM2SQL/Attic/DBBean.java	2004/07/06 10:23:30	1.26
+++ FM2SQL/Attic/DBBean.java	2004/09/20 09:00:58	1.32
@@ -86,8 +86,9 @@ public class DBBean
       DriverManager.registerDriver((Driver) Class.forName("org.postgresql.Driver").newInstance());
       DriverManager.registerDriver((Driver) Class.forName("com.mysql.jdbc.Driver").newInstance());
       DriverManager.registerDriver((Driver) Class.forName("sun.jdbc.odbc.JdbcOdbcDriver").newInstance());
+      DriverManager.registerDriver((Driver) Class.forName("com.ddtek.jdbc.sequelink.SequeLinkDriver").newInstance());
       DriverManager.registerDriver((Driver) Class.forName("acs.jdbc.Driver").newInstance());
-
+ 
       // wait a maximum of 10 seconds when attempting to establish a connection
       DriverManager.setLoginTimeout(10);
     } catch (Exception e)
@@ -612,8 +613,18 @@ public class DBBean
           // container fields
           try
           {
-            tableRow.addElement(new Double(resultSet.getDouble(i)));
-            m_columnClasses.addElement(Double.class);
+            Double value =new Double(resultSet.getDouble(i));
+          
+          
+          // tableRow.addElement(new Double(resultSet.getDouble(i)));
+          String tVal =value.toString();
+          tVal = tVal.substring(tVal.indexOf('.')+1);
+          boolean checkMe = tVal.length()==1&&tVal.equals("0");
+        //  System.out.println("check was"+checkMe+" "+tVal);
+          if(checkMe)
+          tableRow.addElement(new Integer(value.intValue()));
+          else          
+          tableRow.addElement(value);
 
           } catch (Exception e)
           {
@@ -1354,7 +1365,7 @@ public class DBBean
           String tVal =value.toString();
           tVal = tVal.substring(tVal.indexOf('.')+1);
           boolean checkMe = tVal.length()==1&&tVal.equals("0");
-          System.out.println("check was"+checkMe+" "+tVal);
+        //  System.out.println("check was"+checkMe+" "+tVal);
           if(checkMe)
           tableRow.addElement(new Integer(value.intValue()));
           else          
@@ -1518,7 +1529,7 @@ public class DBBean
     ResultSet result = this.result;
     String subQuery = query.substring(query.lastIndexOf(table) + table.length() + 1);
     System.out.println("subQuery " + subQuery);
-    makeQuery("select " + id + " from " + getQC() + table + getQC() + subQuery, numHits);
+    makeQuery("select " + id + " from " + getQC() + table + getQC() + subQuery+"order by  "+id, numHits);
     while (true)
     {
       Vector vec = getNextRow();
@@ -1545,5 +1556,43 @@ public class DBBean
   {
     useNormanToUnicodeMapper = b;
   }
+  /**
+   * 
+   */
+  protected void closeAllConnections() 
+  {
+    Enumeration enumeration =  connectionPool.elements();
+     while(enumeration.hasMoreElements())
+     {
+       ConnectionPool conPol =(ConnectionPool)enumeration.nextElement();
+       try
+      {
+        System.out.println(conPol);
+        conPol.con.close();
+      } catch (SQLException e)
+      {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+     }
+   
+  }
+  /**
+   * @param indexField
+   */
+  public String getColumnType(String indexField) throws SQLException
+  {
+    Vector names=getColumnNames();
+    for (int i = 0; i < names.size(); i++)
+    {
+      if(names.get(i).toString().equals(indexField))
+      {
+        System .out.println("found field "+names.get(i)+" "+metaData.getColumnTypeName(i+1));
+        return metaData.getColumnTypeName(i+1);   
+  
+      }
+    }
+  return "";
+  }
 
 }
\ No newline at end of file