--- FM2SQL/Attic/DBBean.java	2004/01/28 12:22:35	1.6
+++ FM2SQL/Attic/DBBean.java	2004/02/12 13:02:56	1.9
@@ -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)
@@ -1356,12 +1356,14 @@ 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();