--- FM2SQL/Attic/Convert.java	2004/02/16 12:24:17	1.34
+++ 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,29 @@ 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
+   * @param destination
+   * @param names
+   * @param layouts
+   * @param selects
+   * @param creates
+   * @param ids
+   * @param mode
+   * @throws Exception
+   */
   public static void update(String source, String destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids, int mode) throws Exception
   {
     FM2SQL.ProgressDialog dialog = null;
@@ -297,7 +319,7 @@ class Convert
         // System.exit(0);
 
         if (dialog != null)
-          dialog.title.setText("Writing table data ...");
+          dialog.title.setText("Updating table data ...");
 
         int j = -1;
 
@@ -398,11 +420,22 @@ class Convert
 
   }
   /**
-   transfers the specified array of tables  to the destination database
-    and creates the table if it does not exist if it exists and mode is not append the table is dropped
-   
-   **/
-  public static void convert(String source, String destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids, int mode) throws Exception
+   *   transfers the specified array of tables  to the destination database
+      and creates the table if it does not exist if it exists and mode is not append the table is dropped
+ 
+   * @param source
+   * @param destination
+   * @param names
+   * @param layouts
+   * @param selects
+   * @param creates
+   * @param ids
+   * @param 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;
@@ -421,6 +454,7 @@ class Convert
     java.util.TreeSet myIds = new TreeSet();
     int deltaID = 1;
     String idField = "";
+    String destTableName = "";
     if (source != null && destination != null)
     {
       // setting user and passwd 
@@ -432,8 +466,6 @@ class Convert
     String query = null;
     try
     {
-      //bean.setConnection("jdbc:fmpro:http://141.14.237.74:8050");    
-      //bean.setConnection("jdbc:postgresql://erebos/test","postgres","rogo");
       if(source!=null)
       bean.setConnection(source);
       else
@@ -476,7 +508,6 @@ class Convert
           //result = bean.getQueryData(query, dialog, 0);
           bean.getConnection();
           bean.makeQuery(query, 50);
-          // @TODO id Vector must be used in querys while loop over id ranges where id>=start and id<=end
           idField = ids.get(tbIndex).toString();
 
         } catch (Exception e)
@@ -484,7 +515,6 @@ class Convert
           System.out.println(e);
           continue;
         }
-        //beanDest.setConnection("jdbc:postgresql://erebos/test3");
         if(destination!=null)
         beanDest.setConnection(destination);
         else
@@ -500,6 +530,26 @@ class Convert
         // System.exit(0);
         if (mode == Convert.DataBase.CONVERT_MODE)
         {
+          if(!creates.get(tbIndex).equals(""))
+          {
+            String create =creates.get(tbIndex).toString().toLowerCase();
+            int fromIndex = create.indexOf("table")+5;
+            int toIndex   = create.indexOf("(");
+            destTableName = create.substring(fromIndex,toIndex).replaceAll(beanDest.getQC(),"").trim();
+            System.out.println("destTable "+destTableName);
+            
+          } else
+            destTableName = convertText(names.get(tbIndex).toString());
+
+          if (tables.indexOf(destTableName) >= 0)
+          {
+            stm.executeUpdate("drop table " + beanDest.getQC() + destTableName + beanDest.getQC());
+            tables.remove(destTableName);
+            System.out.println("dropped table" + destTableName);
+
+          }
+          /*
+          if(destTableName.equals(""))
           if (tables.indexOf(names.get(tbIndex)) >= 0)
           {
             stm.executeUpdate("drop table " + beanDest.getQC() + names.get(tbIndex) + beanDest.getQC());
@@ -511,9 +561,10 @@ class Convert
             tables.remove(convertText((String) names.get(tbIndex)));
             System.out.println("dropped table" + names.get(tbIndex));
           }
-
-          if (tables.indexOf(names.get(tbIndex)) < 0 && tables.indexOf(convertText(names.get(tbIndex).toString())) < 0)
+*/
+          if ((tables.indexOf(destTableName) < 0)) //&& tables.indexOf(names.get(tbIndex)) < 0 && tables.indexOf(convertText(names.get(tbIndex).toString())) < 0   )
           {
+            
             if (creates.get(tbIndex).equals("") || creates.get(tbIndex).toString().toLowerCase().indexOf("create") < 0)
             {
               System.out.println("Warning empty or invalid create statement - creating one for you\n");
@@ -545,7 +596,7 @@ class Convert
               //  System.exit(0);
               //command.append(DBBean.getQC());   
             } else
-              command = new StringBuffer().append(creates.get(tbIndex).toString());
+              command = new StringBuffer().append(creates.get(tbIndex).toString().toLowerCase());
             stm.executeUpdate(command.toString());
 
           }
@@ -560,10 +611,12 @@ class Convert
 
         command.append("INSERT  INTO ");
         command.append(beanDest.getQC());
-        command.append(convertText((String) names.get(tbIndex)));
+        command.append(destTableName); //convertText((String) names.get(tbIndex)));
         command.append(beanDest.getQC());
+        
         command.append(" values ( ");
 
+        // add a question marks for every field 
         for (int i = 0; i < bean.getColumnNames().size() - 1; ++i)
           command.append("?,");
         command.append("?)");
@@ -574,6 +627,7 @@ class Convert
         int endIndex = -1;
         String tempQuery = query;
         String tempID = bean.getQC() + idField + bean.getQC();
+        // if id_field not do incremental conversion else do it all at once
         if (!idField.equals(""))
         {
           long startTime = System.currentTimeMillis();
@@ -602,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 ...");
@@ -617,6 +671,7 @@ class Convert
               endIndex = k + deltaID;
             }
             System.out.println(endIndex);
+            //all data written ? if not write last chunk of data
             if (endIndex == vec.size() - 1)
               System.out.println("fits");
             else
@@ -624,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 ...");
@@ -635,18 +690,20 @@ class Convert
               dialog.title.setText("Writing table data ...");
               command = writeDatainDestTable(dialog, command, endIndex, pstm, rowCount);
             }
+            // 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();
           System.out.println("Time for incremental convert elapsed " + (endTime - startTime));
         } else
         {
+          // read and write all in one big chunk
           long startTime = System.currentTimeMillis();
-
+          
           bean.makeQuery(query, 0);
           command = writeDatainDestTable(dialog, command, j, pstm, rowCount);
           long endTime = System.currentTimeMillis();
@@ -680,6 +737,17 @@ class Convert
       dialog.setVisible(false);
     }
   }
+  /**
+   * Writes data to the destination table 
+   * @param dialog  progress dialog
+   * @param command 
+   * @param j       data index for progress bar
+   * @param pstm    prepared statement
+   * @param rowCount number of datasets
+   * @return   command
+   * @throws Exception
+   * @throws SQLException
+   */
   private static StringBuffer writeDatainDestTable(FM2SQL.ProgressDialog dialog, StringBuffer command, int j, PreparedStatement pstm, int rowCount) throws Exception, SQLException
   {
     Vector row;
@@ -726,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);
@@ -743,6 +813,11 @@ class Convert
     return command;
   }
 
+  /**
+   *  removes special characters from the input string as well as .fp5 
+   * @param newName String to change
+   * @return
+   */
   public static String convertText(String newName)
   {
     StringBuffer alterMe = new StringBuffer(newName.trim().toLowerCase());
@@ -836,6 +911,11 @@ class Convert
     }
     return alterMe.toString();
   }
+  /**
+   * Converts > and < in an entity (&gt; or &lt;)
+   * @param newName
+   * @return
+   */
   public static String convertToEntities(String newName)
   {
     StringBuffer alterMe = new StringBuffer(newName.trim());
@@ -866,6 +946,11 @@ class Convert
     }
     return alterMe.toString();
   }
+  /**
+   * Masks the single quote character '-->\'
+   * @param newName
+   * @return
+   */
   public static String convertUml(String newName)
   {
     StringBuffer alterMe = new StringBuffer(newName.trim());
@@ -975,7 +1060,11 @@ class Convert
     }
     return alterMe.toString();
   }
-
+/**
+ * parses the input xml file for batch conversion
+ * called from readXMLFile
+ * * @param sb
+ */
   public static void parseXMLConfig(StringBuffer sb)
   {
     boolean finished = false;
@@ -990,6 +1079,7 @@ class Convert
     Vector selects = new Vector();
     Vector creates = new Vector();
     Vector ids = new Vector();
+    String delimiter = "|";
     int mode = -1;
 
     try
@@ -1014,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)
@@ -1023,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();
@@ -1090,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
@@ -1108,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);
 
@@ -1117,96 +1210,9 @@ class Convert
       //   FM2SQL.fmInstance=new FM2SQL();
     } catch (Exception e)
     {
-      // TODO Auto-generated catch block
+    
       e.printStackTrace();
     }
-    /*
-    Node tempNode=root.find(rootNode,new int[] {1});
-    if(tempNode==null) return rtTag;
-    int count=1;
-    /* 
-    for(int i=0;i<tempNode.contents.v.size();++i)
-    {
-      // System.out.println(((Node)tempNode.contents.v.elementAt(i)).attributes+" "+i);
-    }*/
-    /*
-       if(tempNode.contents.v.size()==0) return rtTag;
-       Node notNull=null;
-       Node rtNode=root.find(rootNode+"/rt",new int[] {1,1});
-       rtTag=(rtNode==null) ? "finished":rtNode.getCharacters();
-       System.out.println("rt tag is "+ rtTag);
-       int length=0;//(tempNode.contents.length()-1)/2;
-       for(int i=0;i<tempNode.contents.v.size();++i)    {
-         Node node=(Node)tempNode.contents.v.elementAt(i);
-         if(node.type.equals("element"))
-         if(node.name.equals("doc"))length++;
-         // System.out.println(((Node)tempNode.contents.v.elementAt(i)).attributes+" "+i);
-       }
-      if(length==0) rtTag="finished";        
-       while(count<=length)
-       {
-          //System.out.println(count+" "+length);
-         tempNode=root.find(rootNode+"/doc",new int[] {1,count});
-         if(tempNode==null)
-         {
-           rtTag="finished";
-           break;
-         }    
-         Bundle.Document doc = new Bundle.Document();
-         Hashtable attributes=tempNode.attributes;
-         int docID=0;
-         int ver=0;
-          if(attributes != null)
-         {
-           docID=Integer.parseInt((String)attributes.get("id"));
-           ver=Integer.parseInt((String)attributes.get("ver"));
-           doc.addData("docID",(String)attributes.get("id"));
-           doc.addData("ver",(String)attributes.get("ver"));
-         }
-         bundle.docs.put(new Integer(docID),doc);
-         bundle.documents.addElement(doc);
-         // System.out.println("id " +docID+" ver "+ver);
-         Node fileNode=root.find(rootNode+"/doc/file",new int[] {1,count,1});
-         attributes=(fileNode==null)? null:fileNode.attributes;
-         int fileID=0;
-         int fileVer=0;
-         if(attributes != null)
-         {
-           fileID=Integer.parseInt((String)attributes.get("id"));
-           fileVer=Integer.parseInt((String)attributes.get("ver"));
-           doc.addData("fileID",(String)attributes.get("id"));
-           doc.addData("fileVer",(String)attributes.get("ver"));
-           // System.out.println("fileid " +fileID+" ver "+fileVer);
-         }
-      // add all Document tags to actual Document
-         for(int i=0;i<tempNode.contents.v.size();++i)
-         {   
-           Node node=(Node)tempNode.contents.v.elementAt(i);
-           if(node.type.equals("element"))
-            {
-              //System.out.println(node.name+" "+node.getCharacters()+" "+node.contents.v.size());
-              if(node.contents.v.size()>1) 
-              {
-                for(int j=0;j<node.contents.v.size();++j)
-                {  
-                  Node node2=(Node)node.contents.v.elementAt(j);
-                  if(node2.type.equals("element"))
-                   {
-                     doc.addData(node2.name,node2.getCharacters());
-                     //System.out.println(node2.name+" "+node2.getCharacters()+" "+node2.contents.v.size());
-                   }
-                }
-              } else doc.addData(node.name,node.getCharacters());
-           }
-         }
-         bundle.docsLocator.put(doc.locator,doc); 
-    
-       bundle.documents.addElement(doc);
-         count++;
-       }      */
-
-    // System.out.println(bundle.docs.size());
-    // return rtTag;
   }
   public static Vector getXMLConfig(String xmlFile)
   {
@@ -1243,7 +1249,7 @@ class Convert
     Vector selects = new Vector();
     Vector creates = new Vector();
     Vector ids = new Vector();
-
+		String delimiter = "|";
     int mode = -1;
     try
     {
@@ -1267,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");
@@ -1411,6 +1420,10 @@ class Convert
 
     }
   }
+  /**
+   * reads the specified xml file
+   * @param xmlFile
+   */
   public static void readXMLFile(String xmlFile)
   {
     try
@@ -1433,6 +1446,13 @@ class Convert
       e.printStackTrace();
     }
   }
+  
+  /**
+   * Helper class for XML-File parsing
+   * Holds the parsed data
+   * @author rogo
+   *
+   */
   public static class DataBase
   {
     DBBean bean;
@@ -1441,9 +1461,12 @@ 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;
+    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)
@@ -1457,6 +1480,11 @@ class Convert
       this.mode = mode;
       this.bean.setIDVector(ids);
     }
+    /**
+     * writes the data contained in this object to the buffered writer
+     * * @param buffr
+     * @throws Exception
+     */
     public void exportToXML(BufferedWriter buffr) throws Exception
     {
       // ids=bean.getIDVector();
@@ -1464,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";