--- FM2SQL/src/Convert.java	2005/04/22 11:03:53	1.12
+++ FM2SQL/src/Convert.java	2005/05/02 12:45:36	1.13
@@ -36,7 +36,6 @@ import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -138,7 +137,7 @@ class Convert
 
   static Vector postSQLCommands = new Vector();
 
-  static final String versionID = new String("FM2SQL Version 0.9.5b\n");
+  static final String versionID = new String("FM2SQL Version 0.9.6b\n");
 
   private static boolean noError = false;
 
@@ -727,14 +726,16 @@ class Convert
           // TODO 
           if (beanDest.getTableNames().contains(originalName))
           {
-            DateFormat d = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+            DateFormat d = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
             d.setTimeZone(java.util.TimeZone.getTimeZone("CET"));
-
+          
             String date = d.format(new Date());
             date = date.replace(':', '_');
-            renameTable(beanDest, addQuotes(beanDest, originalName), addQuotes(beanDest,
-                convertText(originalName + "_" + date)));
+            String newName = addQuotes(beanDest, convertText(originalName + "_" + date));
+            // rename table to newName
+            renameTable(beanDest, addQuotes(beanDest, originalName), newName);
           }
+          // rename Table_temp to originalName
           renameTable(beanDest, addQuotes(beanDest, destTableName), addQuotes(beanDest,
               originalName));
         }
@@ -1599,7 +1600,9 @@ class Convert
       buffr.write("      <password>" + bean.passwd + "</password>\n");
       buffr.write("      <delimiter>" + delimiter + "</delimiter>\n");
       String modeString = "";
-      if (mode == CONVERT_MODE)
+      if (mode == CONVERT_TEMP_MODE)
+        modeString = "convert_temp";
+      else if (mode == CONVERT_MODE)
         modeString = "convert";
       else if (mode == APPEND_MODE)
         modeString = "append";