--- FM2SQL/Attic/Convert.java	2004/03/02 12:04:27	1.42
+++ FM2SQL/Attic/Convert.java	2004/03/03 12:10:33	1.43
@@ -667,7 +667,7 @@ class Convert
               if(dialog!=null)
               dialog.title.setText("Writing table data ...");
 
-              command = writeDatainDestTable(dialog, command, k, pstm, rowCount);
+              command = writeDatainDestTable(dialog, command, k, pstm, rowCount,delimiter);
               endIndex = k + deltaID;
             }
             System.out.println(endIndex);
@@ -688,7 +688,7 @@ class Convert
               bean.makeQuery(tempQuery, 0);
               if(dialog!=null)
               dialog.title.setText("Writing table data ...");
-              command = writeDatainDestTable(dialog, command, endIndex, pstm, rowCount);
+              command = writeDatainDestTable(dialog, command, endIndex, pstm, rowCount,delimiter);
             }
             // prepare new query for next chunk
             if (query.indexOf("where") > 0)
@@ -705,7 +705,7 @@ class Convert
           long startTime = System.currentTimeMillis();
           
           bean.makeQuery(query, 0);
-          command = writeDatainDestTable(dialog, command, j, pstm, rowCount);
+          command = writeDatainDestTable(dialog, command, j, pstm, rowCount,delimiter);
           long endTime = System.currentTimeMillis();
           System.out.println("Time for old convert elapsed " + (endTime - startTime));
 
@@ -748,7 +748,7 @@ class Convert
    * @throws Exception
    * @throws SQLException
    */
-  private static StringBuffer writeDatainDestTable(FM2SQL.ProgressDialog dialog, StringBuffer command, int j, PreparedStatement pstm, int rowCount) throws Exception, SQLException
+  private static StringBuffer writeDatainDestTable(FM2SQL.ProgressDialog dialog, StringBuffer command, int j, PreparedStatement pstm, int rowCount,String delimiter) throws Exception, SQLException
   {
     Vector row;
     while ((row = bean.getNextRow()) != null)
@@ -795,7 +795,7 @@ class Convert
         obj = row.get(k);
         if (obj instanceof ArrayList)
 				if (obj instanceof ArrayList)
-			 obj = formatFileMakerArray((List) obj," | ");
+			 obj = formatFileMakerArray((List) obj,delimiter);
       
         String str = (obj == null) ? "NULL" : obj.toString();
         if (!str.equals("NULL"))
@@ -1276,7 +1276,7 @@ class Convert
 				Node delimiterNode =root.find("convert/source/database/delimiter", new int[] { 1, 1, i, 1, 1 });
 				
 				if(delimiterNode!=null) delimiter = delimiterNode.getCharacters();
-
+        System.out.println("delimiter "+delimiterNode.getCharacters());
         if (node3 == null)
           throw new Error("parse error database tag missing");
         if (node == null)
@@ -1304,7 +1304,6 @@ class Convert
           mode = DataBase.APPEND_MODE;
         else if (modeString.equals("update"))
           mode = DataBase.UPDATE_MODE;
-
         //   if(node3!=null)
         // System.out.println(node3.name);
 
@@ -1354,7 +1353,9 @@ class Convert
             creates.add("");
 
         }
-        databases.add(new DataBase(database, tables, layouts, selects, creates, ids, mode));
+        DataBase dataBase=new DataBase(database, tables, layouts, selects, creates, ids, mode);
+        dataBase.delimiter=delimiter;
+        databases.add(dataBase);
       }
       DBBean database = new DBBean();
       // parse dataBase
@@ -1461,7 +1462,7 @@ class Convert
     Vector layouts;
     Vector tables;
     Vector ids;
-    String delimiter = "|";
+    String delimiter = "//";
     final static int CONVERT_MODE = 1;
     final static int APPEND_MODE = 2;
     final static int UPDATE_MODE = 3;