--- FM2SQL/src/Convert.java	2005/04/22 10:57:32	1.11
+++ 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;
@@ -124,7 +123,7 @@ class Convert
 
   final static int numIntervalls = 4;
 
-  static boolean debug = !false;
+  static boolean debug = false;
 
   static boolean isGUI = true;
 
@@ -138,15 +137,16 @@ class Convert
 
   static Vector postSQLCommands = new Vector();
 
-  static final String versionID = new String("FM2SQL Version 0.9.2b\n");
+  static final String versionID = new String("FM2SQL Version 0.9.6b\n");
 
   private static boolean noError = false;
 
   public static void main(String args[]) throws IOException
   {
-    DateFormat d = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
-        Locale.GERMANY);
-    System.out.println(convertText("rogoistSuper" + "_" + d.format(new Date()).replace(':', '_')));
+    //    DateFormat d = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
+    //        Locale.GERMANY);
+    //    System.out.println(convertText("rogoistSuper" + "_" + d.format(new Date()).replace(':', '_')));
+
     /*
      * try { //byte[] b = "�".getBytes("UTF-8"); //
      * System.out.println("QueryString " +b[0]+" "+b[1]+(new
@@ -726,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));
         }
@@ -1598,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";