--- FM2SQL/Attic/Convert.java 2004/01/28 12:29:00 1.22 +++ FM2SQL/Attic/Convert.java 2004/01/30 13:18:54 1.25 @@ -489,6 +489,8 @@ class Convert dialog.setLocation(FM2SQL.fmInstance.getLocationOnScreen().x+(FM2SQL.fmInstance.getWidth()-400)/2,FM2SQL.fmInstance.getLocationOnScreen().y+(FM2SQL.fmInstance.getHeight()-250)/2); dialog.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); FM2SQL.fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + java.util.TreeSet myIds; + int deltaID = 1; dialog.thread=Thread.currentThread(); // setting user and passwd bean.setUserAndPasswd(user,passwd); @@ -537,8 +539,9 @@ class Convert bean.getConnection(); bean.makeQuery(query, 50); // @TODO id Vector must be used in querys while loop over id ranges where id>=start and id<=end - System.out.println("ID LIST "+bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex)).size()); - + myIds = bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex),query); + System.out.println("ID LIST SIZE "+Math.round((double)myIds.size()/10.0)); + deltaID =(int) Math.round((double)myIds.size()/10.0); } catch (Exception e) { continue; @@ -642,7 +645,12 @@ class Convert command.append("?)"); PreparedStatement pstm = beanDest.getConnection().prepareStatement(command.toString()); System.out.println(command); - int rowCount= bean.getRowCount(query); + int rowCount= myIds.size();//bean.getRowCount(query) + Vector vec = new Vector(myIds); + for(int k=0;k