--- FM2SQL/Attic/Convert.java 2004/02/19 11:05:41 1.37 +++ FM2SQL/Attic/Convert.java 2004/03/09 12:34:09 1.45 @@ -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= 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()); @@ -507,9 +578,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"); @@ -541,7 +613,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()); } @@ -556,10 +628,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("?)"); @@ -570,6 +644,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(); @@ -598,9 +673,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 ..."); @@ -609,10 +684,11 @@ 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); + //all data written ? if not write last chunk of data if (endIndex == vec.size() - 1) System.out.println("fits"); else @@ -620,31 +696,33 @@ 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 ..."); 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) - 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); + command = writeDatainDestTable(dialog, command, j, pstm, rowCount,delimiter); long endTime = System.currentTimeMillis(); System.out.println("Time for old convert elapsed " + (endTime - startTime)); @@ -676,7 +754,18 @@ class Convert dialog.setVisible(false); } } - private static StringBuffer writeDatainDestTable(FM2SQL.ProgressDialog dialog, StringBuffer command, int j, PreparedStatement pstm, int rowCount) throws Exception, SQLException + /** + * 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,String delimiter) throws Exception, SQLException { Vector row; while ((row = bean.getNextRow()) != null) @@ -722,7 +811,9 @@ class Convert { obj = row.get(k); if (obj instanceof ArrayList) - obj = ((List) obj).get(0); + if (obj instanceof ArrayList) + obj = formatFileMakerArray((List) obj,delimiter); + String str = (obj == null) ? "NULL" : obj.toString(); if (!str.equals("NULL")) pstm.setString(k + 1, str); @@ -739,6 +830,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()); @@ -832,6 +928,11 @@ class Convert } return alterMe.toString(); } + /** + * Converts > and < in an entity (> or <) + * @param newName + * @return + */ public static String convertToEntities(String newName) { StringBuffer alterMe = new StringBuffer(newName.trim()); @@ -862,6 +963,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()); @@ -971,7 +1077,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; @@ -986,6 +1096,7 @@ class Convert Vector selects = new Vector(); Vector creates = new Vector(); Vector ids = new Vector(); + String delimiter = "|"; int mode = -1; try @@ -1010,7 +1121,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) @@ -1019,6 +1130,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(); @@ -1086,7 +1198,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 @@ -1104,7 +1218,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); @@ -1152,7 +1266,7 @@ class Convert Vector selects = new Vector(); Vector creates = new Vector(); Vector ids = new Vector(); - + String delimiter = "|"; int mode = -1; try { @@ -1176,7 +1290,10 @@ 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"); if (node == null) @@ -1204,7 +1321,6 @@ class Convert mode = DataBase.APPEND_MODE; else if (modeString.equals("update")) mode = DataBase.UPDATE_MODE; - // if(node3!=null) // System.out.println(node3.name); @@ -1254,7 +1370,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 @@ -1320,6 +1438,10 @@ class Convert } } + /** + * reads the specified xml file + * @param xmlFile + */ public static void readXMLFile(String xmlFile) { try @@ -1342,6 +1464,13 @@ class Convert e.printStackTrace(); } } + + /** + * Helper class for XML-File parsing + * Holds the parsed data + * @author rogo + * + */ public static class DataBase { DBBean bean; @@ -1350,9 +1479,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) @@ -1366,6 +1498,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(); @@ -1373,6 +1510,7 @@ class Convert buffr.write(" " + bean.url + "\n"); buffr.write(" " + bean.user + "\n"); buffr.write(" " + bean.passwd + "\n"); + buffr.write(" "+delimiter+"\n"); String modeString = ""; if (mode == CONVERT_MODE) modeString = "convert";