From: <zep...@us...> - 2006-10-31 15:04:30
|
Revision: 157 http://svn.sourceforge.net/pzfilereader/?rev=157&view=rev Author: zepernick Date: 2006-10-31 07:04:16 -0800 (Tue, 31 Oct 2006) Log Message: ----------- converted to factory classes Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvperformancetest/CSVPerformanceTest.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvperformancetest/CSVPerformanceTest.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvperformancetest/CSVPerformanceTest.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvperformancetest/CSVPerformanceTest.java 2006-10-31 15:04:16 UTC (rev 157) @@ -8,6 +8,9 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; /* * Created on Dec 1, 2005 @@ -42,16 +45,17 @@ } public static void call(String filename, boolean verbose, boolean traverse) throws Exception, InterruptedException { - DataSet ds = null; String[] colNames = null; // delimited by a comma // text qualified by double quotes // ignore first record System.out.println("Parsing...."); + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(filename), + ',', '"'); long timeStarted = System.currentTimeMillis(); - ds = new DataSet(new File(filename), ',', '"', false); + final IDataSet ds = pzparser.parse(); long timeFinished = System.currentTimeMillis(); - + String timeMessage = ""; if (timeFinished - timeStarted < 1000) { Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-10-31 15:04:16 UTC (rev 157) @@ -7,8 +7,13 @@ import java.io.File; +import com.sun.jmx.snmp.defaults.DefaultPaths; + import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -20,15 +25,16 @@ */ public class DelimitedColumnNamesInFile { public static void main(final String[] args) throws Exception { - DataSet ds = null; String[] colNames = null; OrderBy orderby = null; // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File("PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '"', false); - + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser( + new File("PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '"'); + final IDataSet ds = pzparser.parse(); + // re order the data set by last name orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY", false)); Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-10-31 15:04:16 UTC (rev 157) @@ -8,6 +8,9 @@ import java.io.File; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -38,9 +41,10 @@ // delimited by a comma // text qualified by double quotes // ignore first record - DataSet ds = null; OrderBy orderby = null; - ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), + new File(data), ',', '"', true); + final IDataSet ds = pzparser.parse(); // re order the data set by last name orderby = new OrderBy(); Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java 2006-10-31 15:04:16 UTC (rev 157) @@ -10,6 +10,9 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -36,25 +39,19 @@ } public static void call(String mapping, String data) throws Exception { - - DataSet ds = null; - String[] colNames = null; - OrderBy orderby = null; - Iterator errors = null; - DataError dataError = null; - - // delimited by a comma + // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); - + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), new File(data), + ',', '"', true); + final IDataSet ds = pzparser.parse(); // re order the data set by last name - orderby = new OrderBy(); + final OrderBy orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY", false)); orderby.addOrderColumn(new OrderColumn("LASTNAME", true)); ds.orderRows(orderby); - colNames = ds.getColumns(); + final String[] colNames = ds.getColumns(); while (ds.next()) { @@ -83,10 +80,9 @@ } System.out.println(">>>>>>ERRORS!!!"); - errors = ds.getErrors().iterator(); - + final Iterator errors = ds.getErrors().iterator(); while (errors.hasNext()) { - dataError = (DataError) errors.next(); + final DataError dataError = (DataError) errors.next(); System.out.println("ERROR: " + dataError.getErrorDesc() + " LINE NUMBER: " + dataError.getLineNo()); } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java 2006-10-31 15:04:16 UTC (rev 157) @@ -9,8 +9,12 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; +import net.sf.pzfilereader.util.ExcelTransformer; /** * @author zepernick @@ -35,16 +39,15 @@ } public static void call(String mapping, String data) throws Exception { - DataSet ds = null; - OrderBy orderby = null; - // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), + new File(data), ',', '"', true); + final IDataSet ds = pzparser.parse(); // re order the data set by last name - orderby = new OrderBy(); + final OrderBy orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY", false)); orderby.addOrderColumn(new OrderColumn("LASTNAME", true)); ds.orderRows(orderby); @@ -56,9 +59,10 @@ } } - // lets write this file out to excel :) + // lets write this file out to excel File xlFile = new File("MyExcelExport.xls"); - ds.writeToExcel(xlFile); + final ExcelTransformer xlTransformer = new ExcelTransformer(ds, xlFile); + xlTransformer.writeExcelFile(); System.out.println("Excel Workbook Written To: " + xlFile.getAbsolutePath()); } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java 2006-10-31 15:04:16 UTC (rev 157) @@ -8,6 +8,9 @@ import java.io.File; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; /** * @author zepernick @@ -32,13 +35,12 @@ } public static void call(String mapping, String data) throws Exception { - DataSet ds = null; - String[] colNames = null; + final PZParser pzparser = DefaultPZParserFactory.getInstance().newFixedLengthParser( + new File(mapping), new File(data)); + final IDataSet ds = pzparser.parse(); - ds = new DataSet(new File(mapping), new File(data), false); + final String[] colNames = ds.getColumns(); - colNames = ds.getColumns(); - while (ds.next()) { for (int i = 0; i < colNames.length; i++) { System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java 2006-10-31 15:04:16 UTC (rev 157) @@ -10,6 +10,9 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; /** * @author zepernick @@ -34,12 +37,12 @@ } public static void call(String mapping, String data) throws Exception { - DataSet ds = null; Iterator errors = null; DataError dataError = null; + final PZParser pzparser = DefaultPZParserFactory.getInstance().newFixedLengthParser(new File(mapping), + new File(data)); + final IDataSet ds = pzparser.parse(); - ds = new DataSet(new File(mapping), new File(data), false); - while (ds.next()) { if (ds.isRecordID("header")) { Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp 2006-10-31 15:04:16 UTC (rev 157) @@ -9,7 +9,6 @@ </head> <% - DataSet ds = null; OrderBy order = null; try{ @@ -23,13 +22,10 @@ mappingFile = new File (appDirectory + "/PEOPLE.pzmap.xml"); txtFile = new File (appDirectory + "/PEOPLE.txt"); - //read in the file a - ds = new DataSet(mappingFile, //mapping file here - txtFile, //text file that is being parsed - ',', //how the file is delimited - 0, //if the text is qualified, pass the qualifier here, otherwise leave empty - false, //ignore the first row in the file if it contain column names - false); //don't auto add missing columns, log them as errors + //read in the file + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(mappingFile, + txtFile, ',', 0, false) ; + final IDataSet ds = pzparser.parse(); //check to see if there is a paramter in the request that is telling us what column to sort by Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java 2006-10-31 15:04:16 UTC (rev 157) @@ -8,6 +8,9 @@ import java.io.File; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; /** * @author zepernick @@ -32,14 +35,14 @@ } public static void call(String data) throws Exception { - DataSet ds = null; - String[] colNames = null; // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(data), ',', '"', false); + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(data), + ',', '\"'); + final IDataSet ds = pzparser.parse(); - colNames = ds.getColumns(); + final String[] colNames = ds.getColumns(); while (ds.next()) { for (int i = 0; i < colNames.length; i++) { Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java 2006-10-31 14:38:33 UTC (rev 156) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java 2006-10-31 15:04:16 UTC (rev 157) @@ -9,6 +9,9 @@ import java.text.SimpleDateFormat; import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultPZParserFactory; +import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.PZParser; /** * @author zepernick @@ -32,15 +35,15 @@ } public static void call(String mapping, String data) throws Exception { - DataSet ds = null; // wll provide a clean format for printing the date to the screen final SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy"); // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); - + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), + new File(data), ',', '\"', true); + final IDataSet ds = pzparser.parse(); // demonstrates the casting abilities of PZFileReader while (ds.next()) { System.out.println("Item Desc: " + ds.getString("ITEM_DESC") + " (String)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |