--- FM2SQL/Attic/Convert.java	2004/03/15 12:30:51	1.47
+++ FM2SQL/Attic/Convert.java	2004/03/16 10:36:37	1.49
@@ -1150,6 +1150,9 @@ class Convert
           mode = DataBase.APPEND_MODE;
         else if (modeString.equals("update"))
           mode = DataBase.UPDATE_MODE;
+        else if (modeString.equals("delete"))
+          mode = DataBase.DELETE_MODE;
+
         //   if(node3!=null)
         // System.out.println(node3.name);
 
@@ -1321,6 +1324,9 @@ class Convert
           mode = DataBase.APPEND_MODE;
         else if (modeString.equals("update"))
           mode = DataBase.UPDATE_MODE;
+        else if (modeString.equals("delete"))
+          mode = DataBase.DELETE_MODE;
+
         //   if(node3!=null)
         // System.out.println(node3.name);
 
@@ -1517,6 +1523,8 @@ class Convert
         modeString = "append";
       else if (mode == UPDATE_MODE)
         modeString = "update";
+      else if (mode == DELETE_MODE)
+             modeString = "delete";
 
       buffr.write("      <mode>" + modeString + "</mode>\n");
       int index = 0;
@@ -1671,7 +1679,8 @@ class Convert
         int endIndex = -1;
         String tempQuery = query;
         String destQuery = query.replaceAll(names.get(tbIndex).toString(), destTableName);
-        String tempQueryDest = destQuery.substring(0,destQuery.lastIndexOf(destTableName)+destTableName.length()+1);
+        String tempQueryDest = destQuery;
+        // remove extra query parts destQuery.substring(0,destQuery.lastIndexOf(destTableName)+destTableName.length()+1);
         System.out.println("new Query " + tempQueryDest);
         if (!idField.equals(""))
         {
@@ -1733,7 +1742,7 @@ class Convert
             while (true)
             {
 
-              j++;
+              ++j;
               if (j == linesToDelete.size())
                 break;
               //print rows