--- FM2SQL/src/Convert.java 2005/03/21 10:32:03 1.5 +++ FM2SQL/src/Convert.java 2005/04/12 10:58:54 1.8 @@ -31,9 +31,11 @@ import java.sql.Statement; import java.sql.Types; import java.text.ParseException; import java.util.ArrayList; +import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import java.util.List; +import java.util.Properties; import java.util.StringTokenizer; import java.util.TreeSet; import java.util.Vector; @@ -93,9 +95,13 @@ class Convert public void executeCommand() throws SQLException, Exception { + System.out.println("Executing command: \n"); + System.out.println(command); + java.sql.Connection con = bean.getConnection(); Statement stm = con.createStatement(); stm.execute(command); + stm.close(); } } @@ -129,6 +135,8 @@ class Convert static Vector postSQLCommands = new Vector(); + static final String versionID = new String("FM2SQL Version 0.9.0b\n"); + public static void main(String args[]) throws IOException { /* @@ -138,32 +146,51 @@ class Convert * //System.out.println(new String(b,"UTF-8")); } catch * (UnsupportedEncodingException e) { e.printStackTrace(); } */ + File tmpPath = new File(System.getProperty("java.io.tmpdir")); isGUI = false; FileOutputStream file = null; if (args.length != 1) { + System.out.println(versionID); System.out.println("Usage: java Convert "); + System.out.println("Log file will be written in "+tmpPath.getCanonicalPath()+" folder "); System.exit(-1); } + File temp = null; try { - File temp = File.createTempFile("fm2sql", ".txt"); + temp = new File(tmpPath, "fm2sql.txt"); + int count = 1; + while (temp.exists()) + { + temp = new File(tmpPath, "fm2sql" + generateSuffix(count++) + ".txt"); + } file = new FileOutputStream(temp); } catch (FileNotFoundException e1) { e1.printStackTrace(); } PrintStream stream = new PrintStream(file, true); + // write info for user to stdout + System.out.println(versionID); + System.out.println("Loading "+args[0]+"...."); + System.out.println("Log will be written to "+temp.getCanonicalPath()); + if (!debug) { System.setOut(stream); System.setErr(stream); } + System.out.println(versionID); + System.out.println("Using config file : "+args[0]+"...."); + StringBuffer sb = readXMLFile(args[0]); parseXMLConfig(sb); if (!(new File(args[0]).exists())) - System.exit(0); + { + System.exit(0); + } System.out.println("Finished!"); // convert("jdbc:fmpro:http://141.14.237.74:8050","jdbc:postgresql://erebos/test",null,null); } @@ -417,7 +444,7 @@ class Convert public static void convert(String source, String destination, Vector names, Vector layouts, Vector selects, Vector creates, Vector ids, int mode, String delimiter) throws Exception { - + // TODO implement convert_temp mode!!! FM2SQL.ProgressDialog dialog = null; if (isGUI) @@ -502,8 +529,12 @@ class Convert ConversionProperties prop = getFieldNamesAndDestTableName(creates.get(tbIndex).toString(), query, names.get(tbIndex).toString()); destTableName = prop.destTableName; + if (mode == Convert.DataBase.CONVERT_TEMP_MODE) + { + destTableName += "_temp"; + } fieldNames = prop.fieldNames; - if (mode == Convert.DataBase.CONVERT_MODE) + if (mode == Convert.DataBase.CONVERT_MODE || mode == Convert.DataBase.CONVERT_TEMP_MODE) { if (tables.indexOf(destTableName) >= 0) @@ -511,7 +542,6 @@ class Convert stm.executeUpdate("drop table " + beanDest.getQC() + destTableName + beanDest.getQC()); tables.remove(destTableName); System.out.println("dropped table" + destTableName); - } if ((tables.indexOf(destTableName) < 0)) { @@ -525,7 +555,7 @@ class Convert command = new StringBuffer(50); command.append("CREATE TABLE "); 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("("); String type = null; @@ -981,9 +1011,19 @@ class Convert try { databases = getXMLConfig(sb); - + + // destination DataBase object + DataBase dbDest = ((DataBase) databases.lastElement()); + DBBean database = ((DataBase) databases.lastElement()).bean; databases.remove(databases.size() - 1); + + for (Iterator iterator = dbDest.preCommands.iterator(); iterator.hasNext();) + { + SQLCommand sqlCommand = (SQLCommand) iterator.next(); + sqlCommand.executeCommand(); + } + // databases.add(database); for (Iterator iter = databases.iterator(); iter.hasNext();) { @@ -994,7 +1034,8 @@ class Convert sqlCommand.executeCommand(); } int mode = db.mode; - if (mode == DataBase.CONVERT_MODE || mode == DataBase.APPEND_MODE) + if (mode == DataBase.CONVERT_MODE || mode == DataBase.APPEND_MODE + || mode == DataBase.CONVERT_TEMP_MODE) convertBatch(db.bean, database, db.tables, db.layouts, db.selects, db.creates, db.ids, mode, db.delimiter); else if (mode == DataBase.UPDATE_MODE) @@ -1024,6 +1065,11 @@ class Convert } } + for (Iterator iterator = dbDest.postCommands.iterator(); iterator.hasNext();) + { + SQLCommand sqlCommand = (SQLCommand) iterator.next(); + sqlCommand.executeCommand(); + } } catch (Exception e) { @@ -1143,6 +1189,9 @@ class Convert else if (modeString.equals("synchronize")) mode = DataBase.SYNCHRONIZE_MODE; + else if (modeString.equals("convert_temp")) + mode = DataBase.CONVERT_TEMP_MODE; + // if(node3!=null) // System.out.println(node3.name); @@ -1404,7 +1453,7 @@ class Convert Vector layouts; - Vector tables=new Vector(); + Vector tables = new Vector(); Vector ids; @@ -1430,6 +1479,8 @@ class Convert final static int SYNCHRONIZE_MODE = 5; + final static int CONVERT_TEMP_MODE = 6; + int mode = -1; public DataBase(DBBean bean, Vector tables, Vector layouts, Vector selects, Vector creates, @@ -1495,8 +1546,9 @@ class Convert { while (count < preCommands.size()) { - SQLCommand sqlcommand=(SQLCommand)preCommands.get(count); - buffr.write(" " + sqlcommand.command + "\n"); + SQLCommand sqlcommand = (SQLCommand) preCommands.get(count); + buffr.write(" " + sqlcommand.command + + "\n"); count++; } } @@ -1505,9 +1557,10 @@ class Convert count = 0; while (count < postCommands.size()) { - SQLCommand sqlcommand=(SQLCommand)postCommands.get(count); - - buffr.write(" " + sqlcommand.command + "\n"); + SQLCommand sqlcommand = (SQLCommand) postCommands.get(count); + + buffr.write(" " + sqlcommand.command + + "\n"); count++; } } @@ -3638,7 +3691,7 @@ class Convert // retrieve field_names from select statement // TODO problem with different fieldNames in create statement will // overwrite them - if (query.indexOf("*") < 0) + if (query.indexOf("*") < 0 && create.equals(""))// quick hack for hartmut { int selectEndIndex = query.indexOf("from"); StringTokenizer tokenizer = new StringTokenizer(query.substring(6, selectEndIndex), ","); @@ -3830,4 +3883,17 @@ class Convert // ****** end Test ****** } + + public final static String generateSuffix(final int step) + { + String fileString = null; + if (step < 10) + fileString = "00" + step; + else if (step < 100) + fileString = "0" + step; + else + fileString = step + ""; + return fileString; + } + } \ No newline at end of file