--- FM2SQL/Attic/Convert.java	2004/02/12 13:02:56	1.32
+++ FM2SQL/Attic/Convert.java	2004/02/13 12:28:41	1.33
@@ -640,16 +640,24 @@ class Convert
     if (!idField.equals(""))
     {
       long startTime = System.currentTimeMillis();
+      int counter = -1;
       while (true)
       {
-        dialog.title.setText("Retrieving next ID Vector ");
+        ++counter;
+        if(counter==0)
+        dialog.title.setText("Check if data  is available");
+        else
+        dialog.title.setText("Check if more  data  is available");
         myIds = bean.getIDVector(ids.get(tbIndex).toString(), (String) names.get(tbIndex), tempQuery, numHits);
         if(myIds.isEmpty()) break;
         vec = new Vector(myIds);
-        rowCount = vec.size()/numIntervalls;
+        rowCount = vec.size();
         System.out.println("ID LIST SIZE " + Math.round((double) myIds.size() / (double) numIntervalls) + " " + myIds.size());
         deltaID = (int) Math.round((double) myIds.size() / (double) numIntervalls);
-
+        if (vec.size() <= numIntervalls)
+        {
+          endIndex = 0; deltaID = vec.size();
+        }
         for (int k = 0; k < vec.size() - deltaID; k = k + deltaID)
         {
           System.out.println(vec.get(k) + " " + vec.get(k + deltaID) + " " + vec.lastElement());
@@ -666,10 +674,13 @@ class Convert
           command = writeDatainDestTable(dialog, command, k, pstm, rowCount);
           endIndex = k + deltaID;
         }
-        if ((vec.size() - 1) % numIntervalls == 0)
+       System.out.println(endIndex);
+        if (endIndex == vec.size()-1)
           System.out.println("fits");
         else
         {
+          System.out.println(" last intervall from " + vec.get(endIndex) + " " + vec.lastElement());
+
           if (query.indexOf("where") > 0)
             tempQuery = query + " and " + tempID + ">=" + vec.get(endIndex) + " and " + tempID + "<=" + vec.lastElement();
           else
@@ -678,10 +689,7 @@ class Convert
           dialog.title.setText("Reading table data ...");
           bean.makeQuery(tempQuery, 0);
           dialog.title.setText("Writing table data ...");
-          command = writeDatainDestTable(dialog, command, j, pstm, rowCount);
-
-          System.out.println(" last intervall from " + vec.get(endIndex) + " " + vec.lastElement());
-          command = writeDatainDestTable(dialog, command, endIndex, pstm, rowCount);
+           command = writeDatainDestTable(dialog, command, endIndex, pstm, rowCount);
         }
         if (query.indexOf("where") > 0)
           tempQuery = query + " and " + tempID + ">" + vec.lastElement();