--- FM2SQL/Attic/Convert.java	2004/01/22 12:28:03	1.19
+++ FM2SQL/Attic/Convert.java	2004/01/28 12:22:35	1.21
@@ -1,5 +1,4 @@
 
-
 import java.util.*;
 import java.sql.*;
 import java.awt.Cursor;
@@ -382,7 +381,6 @@ class Convert
           dialog.title.setText("Writing table data ...");
 
         int j = -1;
-				System.out.println(bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex)).size());
     
         Vector row = null;
         command = new StringBuffer();
@@ -483,7 +481,7 @@ class Convert
 
 
 
-  public static void  convert(String source,String destination,Vector names,Vector layouts,Vector selects,Vector creates,int mode) throws Exception
+  public static void  convert(String source,String destination,Vector names,Vector layouts,Vector selects,Vector creates,Vector ids,int mode) throws Exception
   {
    FM2SQL.ProgressDialog dialog = new  FM2SQL.ProgressDialog(FM2SQL.fmInstance);
    dialog.setTitle("Conversion running ...");
@@ -513,10 +511,11 @@ class Convert
       for(tbIndex=0;tbIndex<names.size();++tbIndex)
       {
         Vector[] result = null;
-       try {
-	    query = "select * from " + bean.getQC() +names.get(tbIndex).toString() + bean.getQC();
-	   String layout=(layouts.isEmpty()) ? "":layouts.get(tbIndex).toString(); 
-     query = (selects!=null) ? selects.get(tbIndex).toString():query;
+      try
+      {
+        query = "select * from " + bean.getQC() + names.get(tbIndex).toString() + bean.getQC();
+        String layout = (layouts.isEmpty()) ? "" : layouts.get(tbIndex).toString();
+        query = (selects != null) ? selects.get(tbIndex).toString() : query;
         //if  vectors[1].get(i) != null)
         if (layout != "")
         {
@@ -525,8 +524,8 @@ class Convert
           StringBuffer queryLayout = new StringBuffer(query);
           queryLayout.insert(queryLayout.indexOf(name) + name.length() + 1, " " + layout);
           query = queryLayout.toString();
-          System.out.println("added layout  "+ query);
-        
+          System.out.println("added layout  " + query);
+
         }
         //  if ( layout!= "")
         //	 query += " layout " + bean.getQC() + layout + bean.getQC();
@@ -536,11 +535,13 @@ class Convert
         dialog.show();
         //result = bean.getQueryData(query, dialog, 0);
         bean.getConnection();
-        bean.makeQuery(query,0);
+        bean.makeQuery(query, 50);
+        System.out.println("ID LIST "+bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex)).size());
+
       } catch (Exception e)
-        {
-          continue;
-        }
+      {
+        continue;
+      }
         //beanDest.setConnection("jdbc:postgresql://erebos/test3");
         beanDest.setConnection(destination);