--- FM2SQL/Attic/DBBean.java	2004/01/22 12:28:03	1.5
+++ FM2SQL/Attic/DBBean.java	2004/03/12 11:48:57	1.10
@@ -67,9 +67,9 @@ public class DBBean
     {
       DriverManager.registerDriver(new com.fmi.jdbc.JdbcDriver());
       DriverManager.registerDriver((Driver) Class.forName("org.postgresql.Driver").newInstance());
-      DriverManager.registerDriver((Driver) Class.forName("sun.jdbc.odbc.JdbcOdbcDriver").newInstance());
       DriverManager.registerDriver((Driver) Class.forName("com.mysql.jdbc.Driver").newInstance());
-
+      DriverManager.registerDriver((Driver) Class.forName("sun.jdbc.odbc.JdbcOdbcDriver").newInstance());
+     
       // wait a maximum of 10 seconds when attempting to establish a connection
       DriverManager.setLoginTimeout(10);
     } catch (Exception e)
@@ -1226,8 +1226,17 @@ public class DBBean
           //  m_columnClasses.addElement(String.class);
         } // to catch
 
-      } else if (metaData.getColumnType(i) == Types.DATE)
-      {
+      } else if (metaData.getColumnType(i) == Types.INTEGER)
+        {
+          // use the ResultSet.getObject method for retieving images
+          // from FileMaker Pro container fields; the ResultSet.getObject
+          // method returns a java.awt.Image object for FileMaker Pro
+          // container fields
+
+          tableRow.addElement(new Integer(resultSet.getInt(i)));
+          //  m_columnClasses.addElement(java.sql.Date.class);
+        } else if (metaData.getColumnType(i) == Types.DATE)
+        {
         // use the ResultSet.getObject method for retieving images
         // from FileMaker Pro container fields; the ResultSet.getObject
         // method returns a java.awt.Image object for FileMaker Pro
@@ -1356,21 +1365,24 @@ public class DBBean
     resultSet.next();
     return resultSet.getInt(1);
   }
-	public TreeSet getIDVector(String id,String table) throws Exception
+	public TreeSet getIDVector(String id,String table,String query,int numHits) throws Exception
 	{
 	  TreeSet t= new TreeSet();
 	  getConnection();
 	  ResultSet result = this.result;
-	  makeQuery("select "+id+" from "+getQC()+table+getQC(),0 );
+	  String subQuery = query.substring(query.lastIndexOf(table)+table.length()+1);
+    System.out.println("subQuery "+subQuery);
+    makeQuery("select "+id+" from "+getQC()+table+getQC()+subQuery,numHits );
 	  while(true)
 	  {
-	  
-	  Vector vec = getNextRow();
-	  if(vec==null) break;
-	  t.add(vec.get(0));
+      Vector vec = getNextRow();
+      if (vec == null)
+        break;
+      t.add(vec.get(0));
 	  }
 		this.result=result;
-		return t;
+    metaData = (this.result==null) ?null:this.result.getMetaData();
+    return t;
 	}
 	
 }
\ No newline at end of file