--- FM2SQL/Attic/Convert.java	2004/02/27 11:34:53	1.40
+++ FM2SQL/Attic/Convert.java	2004/03/02 12:04:27	1.42
@@ -59,11 +59,11 @@ class Convert
     System.out.println("Finished!");
     //convert("jdbc:fmpro:http://141.14.237.74:8050","jdbc:postgresql://erebos/test",null,null);
   }
-  public static void convertBatch(DBBean source, DBBean destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids,int mode) throws Exception
+  public static void convertBatch(DBBean source, DBBean destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids,int mode,String delimiter) throws Exception
   {
     bean = source;
     beanDest = destination;
-    convert(null,null,names,layouts,selects,creates,ids,mode);
+    convert(null,null,names,layouts,selects,creates,ids,mode,delimiter);
     if(true) return;
     StringBuffer command = null;
     try
@@ -190,7 +190,7 @@ class Convert
           {
             obj = row.get(k);
             if (obj instanceof ArrayList)
-              obj = ((List) obj).get(0);
+              obj = formatFileMakerArray((List) obj,"\n");
             String str = (obj == null) ? "NULL" : obj.toString();
             if (!str.equals("NULL"))
               pstm.setString(k + 1, str);
@@ -221,7 +221,17 @@ class Convert
 
     //  dialog.setVisible(false); 
   }
-
+	public static String formatFileMakerArray(List list, String delimiter)
+	{ 
+	  StringBuffer formattedString = new StringBuffer();
+	  for(int i=0;i<list.size();++i)
+	  {
+		  formattedString.append(list.get(i).toString());
+			if(i<list.size()-1)
+			 formattedString.append(delimiter);
+	  } 
+	  return formattedString.toString();
+	}
   /**
    * Method for SQL UPDATE
    * @param source
@@ -425,7 +435,7 @@ class Convert
    */ 
   
      
-  public static void convert(String source, String destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids, int mode) throws Exception
+  public static void convert(String source, String destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids, int mode,String delimiter) throws Exception
   {
 
     FM2SQL.ProgressDialog dialog = null;
@@ -784,7 +794,9 @@ class Convert
       {
         obj = row.get(k);
         if (obj instanceof ArrayList)
-          obj = ((List) obj).get(0);
+				if (obj instanceof ArrayList)
+			 obj = formatFileMakerArray((List) obj," | ");
+      
         String str = (obj == null) ? "NULL" : obj.toString();
         if (!str.equals("NULL"))
           pstm.setString(k + 1, str);
@@ -1067,6 +1079,7 @@ class Convert
     Vector selects = new Vector();
     Vector creates = new Vector();
     Vector ids = new Vector();
+    String delimiter = "|";
     int mode = -1;
 
     try
@@ -1091,7 +1104,7 @@ class Convert
         Node node2 = root.find("convert/source/database/password", new int[] { 1, 1, i, 1, 1 });
         Node node3 = root.find("convert/source/database", new int[] { 1, 1, i });
         Node nodeMode = root.find("convert/source/database/mode", new int[] { 1, 1, i, 1, 1 });
-
+        Node delimiterNode =root.find("convert/source/database/delimiter", new int[] { 1, 1, i, 1, 1 });
         if (node3 == null)
           throw new Error("parse error database tag missing");
         if (node == null)
@@ -1100,6 +1113,7 @@ class Convert
           throw new Error("parse error user tag missing");
         if (node2 == null)
           throw new Error("parse error password tag missing");
+        if(delimiterNode!=null) delimiter = delimiterNode.getCharacters();
         String url = node.getCharacters();
         String user = node1.getCharacters();
         String password = node2.getCharacters();
@@ -1167,7 +1181,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
@@ -1185,7 +1201,7 @@ class Convert
       {
         DataBase db = (DataBase) iter.next();
         if (mode != DataBase.UPDATE_MODE)
-          convertBatch(db.bean, database, db.tables, db.layouts, db.selects, db.creates, db.ids,mode);
+          convertBatch(db.bean, database, db.tables, db.layouts, db.selects, db.creates, db.ids,mode,db.delimiter);
         else
           update(db.bean.url, database.url, db.tables, db.layouts, db.selects, db.creates, db.ids, mode);
 
@@ -1233,7 +1249,7 @@ class Convert
     Vector selects = new Vector();
     Vector creates = new Vector();
     Vector ids = new Vector();
-
+		String delimiter = "|";
     int mode = -1;
     try
     {
@@ -1257,6 +1273,9 @@ class Convert
         Node node2 = root.find("convert/source/database/password", new int[] { 1, 1, i, 1, 1 });
         Node node3 = root.find("convert/source/database", new int[] { 1, 1, i });
         Node nodeMode = root.find("convert/source/database/mode", new int[] { 1, 1, i, 1, 1 });
+				Node delimiterNode =root.find("convert/source/database/delimiter", new int[] { 1, 1, i, 1, 1 });
+				
+				if(delimiterNode!=null) delimiter = delimiterNode.getCharacters();
 
         if (node3 == null)
           throw new Error("parse error database tag missing");
@@ -1442,6 +1461,7 @@ class Convert
     Vector layouts;
     Vector tables;
     Vector ids;
+    String delimiter = "|";
     final static int CONVERT_MODE = 1;
     final static int APPEND_MODE = 2;
     final static int UPDATE_MODE = 3;
@@ -1461,7 +1481,7 @@ class Convert
       this.bean.setIDVector(ids);
     }
     /**
-     * writes the data contained in this object  th the buffered writer
+     * writes the data contained in this object to the buffered writer
      * * @param buffr
      * @throws Exception
      */
@@ -1472,6 +1492,7 @@ class Convert
       buffr.write("      <url>" + bean.url + "</url>\n");
       buffr.write("      <user>" + bean.user + "</user>\n");
       buffr.write("      <password>" + bean.passwd + "</password>\n");
+      buffr.write("      <delimiter>"+delimiter+"</delimiter>\n");
       String modeString = "";
       if (mode == CONVERT_MODE)
         modeString = "convert";