--- FM2SQL/Attic/Convert.java	2004/02/23 10:59:53	1.38
+++ FM2SQL/Attic/Convert.java	2004/03/01 12:37:10	1.41
@@ -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
@@ -646,9 +656,9 @@ class Convert
             {
               System.out.println(vec.get(k) + " " + vec.get(k + deltaID) + " " + vec.lastElement());
               if (query.indexOf("where") > 0)
-                tempQuery = query + " and " + tempID + ">=" + vec.get(k) + " and " + tempID + "<=" + vec.get(k + deltaID);
+                tempQuery = query + " and " + tempID + ">='" + vec.get(k) + "' and " + tempID + "<='" + vec.get(k + deltaID)+"'";
               else
-                tempQuery = query + " where " + tempID + ">=" + vec.get(k) + " and " + tempID + "<=" + vec.get(k + deltaID);
+                tempQuery = query + " where " + tempID + ">='" + vec.get(k) + "' and " + tempID + "<='" + vec.get(k + deltaID)+"'";
               System.out.println(tempQuery);
               if(dialog!=null)
               dialog.title.setText("Reading table data ...");
@@ -669,9 +679,9 @@ class Convert
               System.out.println(" last intervall from " + vec.get(endIndex) + " " + vec.lastElement());
 
               if (query.indexOf("where") > 0)
-                tempQuery = query + " and " + tempID + ">=" + vec.get(endIndex) + " and " + tempID + "<=" + vec.lastElement();
+                tempQuery = query + " and " + tempID + ">='" + vec.get(endIndex) + "' and " + tempID + "<='" + vec.lastElement()+"'";
               else
-                tempQuery = query + "where " + tempID + ">=" + vec.get(endIndex) + " and " + tempID + "<=" + vec.lastElement();
+                tempQuery = query + " where " + tempID + ">='" + vec.get(endIndex) + "' and " + tempID + "<='" + vec.lastElement()+"'";
               System.out.println(tempQuery);
               if(dialog!=null)
               dialog.title.setText("Reading table data ...");
@@ -682,9 +692,9 @@ class Convert
             }
             // prepare new query for next chunk
             if (query.indexOf("where") > 0)
-              tempQuery = query + " and " + tempID + ">" + vec.lastElement();
+              tempQuery = query + " and " + tempID + ">'" + vec.lastElement()+"'";
             else
-              tempQuery = query + " where " + tempID + ">" + vec.lastElement();
+              tempQuery = query + " where " + tempID + ">'" + vec.lastElement()+"'";
 
           }
           long endTime = System.currentTimeMillis();
@@ -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);
@@ -1445,6 +1457,8 @@ class Convert
     final static int CONVERT_MODE = 1;
     final static int APPEND_MODE = 2;
     final static int UPDATE_MODE = 3;
+    final static int DELETE_MODE = 4;
+
     int mode = -1;
 
     public DataBase(DBBean bean, Vector tables, Vector layouts, Vector selects, Vector creates, Vector ids, int mode)