--- FM2SQL/Attic/Convert.java 2004/01/29 12:13:45 1.24 +++ FM2SQL/Attic/Convert.java 2004/02/09 09:44:49 1.26 @@ -25,7 +25,7 @@ class Convert static String userDest="postgres",passwdDest="rogo"; static boolean batchRun=false; static Vector databases = new Vector(); - + final static int numIntervalls = 10; public static void main(String args[]) { /* try @@ -490,6 +490,7 @@ class Convert 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); @@ -538,9 +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 - myIds = bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex)); - System.out.println("ID LIST SIZE "+myIds.size()); - + myIds = bean.getIDVector(ids.get(tbIndex).toString(),(String) names.get(tbIndex),query); + System.out.println("ID LIST SIZE "+Math.round((double)myIds.size()/(double)numIntervalls)+" "+myIds.size()); + deltaID =(int) Math.round((double)myIds.size()/(double)numIntervalls); } catch (Exception e) { continue; @@ -646,10 +647,17 @@ class Convert System.out.println(command); int rowCount= myIds.size();//bean.getRowCount(query) Vector vec = new Vector(myIds); - for(int k=0;k