From: <zep...@us...> - 2006-10-25 11:37:10
|
Revision: 123 http://svn.sourceforge.net/pzfilereader/?rev=123&view=rev Author: zepernick Date: 2006-10-25 04:36:46 -0700 (Wed, 25 Oct 2006) Log Message: ----------- removed freeMemory() call and updated constructor I have not tested the changes yet. I go back through and make sure they are still okay Modified Paths: -------------- 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/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java 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/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-10-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-10-25 11:36:46 UTC (rev 123) @@ -27,7 +27,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File("PEOPLE-CommaDelimitedWithQualifier.txt"), ",", "\"", false); + ds = new DataSet(new File("PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '"', false); // re order the data set by last name orderby = new OrderBy(); @@ -53,8 +53,5 @@ } } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-10-25 11:36:46 UTC (rev 123) @@ -40,7 +40,7 @@ // ignore first record DataSet ds = null; OrderBy orderby = null; - ds = new DataSet(new File(mapping), new File(data), ",", "\"", true, false); + ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); // re order the data set by last name orderby = new OrderBy(); @@ -79,7 +79,5 @@ System.out.println("FOUND ERRORS IN FILE"); } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java 2006-10-25 11:36:46 UTC (rev 123) @@ -46,7 +46,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ",", "\"", true, false); + ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); // re order the data set by last name orderby = new OrderBy(); @@ -91,8 +91,5 @@ System.out.println("ERROR: " + dataError.getErrorDesc() + " LINE NUMBER: " + dataError.getLineNo()); } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java 2006-10-25 11:36:46 UTC (rev 123) @@ -41,7 +41,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ",", "\"", true, false); + ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); // re order the data set by last name orderby = new OrderBy(); @@ -61,8 +61,5 @@ ds.writeToExcel(xlFile); System.out.println("Excel Workbook Written To: " + xlFile.getAbsolutePath()); - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java 2006-10-25 11:36:46 UTC (rev 123) @@ -47,8 +47,5 @@ System.out.println("==========================================================================="); } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java 2006-10-25 11:36:46 UTC (rev 123) @@ -78,8 +78,5 @@ } } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp 2006-10-25 11:36:46 UTC (rev 123) @@ -26,8 +26,8 @@ //read in the file a ds = new DataSet(mappingFile, //mapping file here txtFile, //text file that is being parsed - ",", //how the file is delimited - "", //if the text is qualified, pass the qualifier here, otherwise leave empty + ',', //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 @@ -110,9 +110,6 @@ <% } - - //clear out the DataSet object for the JVM to collect - ds.freeMemory(); %> </table> Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-10-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-10-25 11:36:46 UTC (rev 123) @@ -43,7 +43,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new LargeDataSet(pzmap, fileToParse, ",", "\"", true, false); + ds = new LargeDataSet(pzmap, fileToParse, ',', '"', true, false); colNames = ds.getColumns(); Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-10-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-10-25 11:36:46 UTC (rev 123) @@ -47,7 +47,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new LargeDataSet(new File(data), ",", "\"", false); + ds = new LargeDataSet(new File(data), ',', '"', false); final long timeStarted = System.currentTimeMillis(); int totalCount = 0; Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java 2006-10-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java 2006-10-25 11:36:46 UTC (rev 123) @@ -52,7 +52,7 @@ // text qualifier. The text qualifier is optional, it can be // null // or empty - elements = ParserUtils.splitLine(line, ",", "\""); + elements = ParserUtils.splitLine(line, ',', '"'); for (int i = 0; i < elements.size(); i++) { System.out.println("Column " + i + ": " + (String) elements.get(i)); 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java 2006-10-25 11:36:46 UTC (rev 123) @@ -37,7 +37,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(data), ",", "\"", false); + ds = new DataSet(new File(data), ',', '"', false); colNames = ds.getColumns(); @@ -53,8 +53,5 @@ System.out.println("FOUND ERRORS IN FILE"); } - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } 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-25 11:28:47 UTC (rev 122) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java 2006-10-25 11:36:46 UTC (rev 123) @@ -39,7 +39,7 @@ // delimited by a comma // text qualified by double quotes // ignore first record - ds = new DataSet(new File(mapping), new File(data), ",", "\"", true, false); + ds = new DataSet(new File(mapping), new File(data), ',', '"', true, false); // demonstrates the casting abilities of PZFileReader while (ds.next()) { @@ -49,9 +49,5 @@ System.out.println("Received Dt: " + sdf.format(ds.getDate("LAST_RECV_DT")) + " (Date)"); System.out.println("==========================================================================="); } - - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <zep...@us...> - 2006-11-27 13:27:45
|
Revision: 207 http://svn.sourceforge.net/pzfilereader/?rev=207&view=rev Author: zepernick Date: 2006-11-27 05:27:43 -0800 (Mon, 27 Nov 2006) Log Message: ----------- renamed IDataSet to DataSet Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvheaderandtrailer/CSVHeaderAndTrailer.java 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/lowlevelparse/LowLevelParse.java 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/csvheaderandtrailer/CSVHeaderAndTrailer.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvheaderandtrailer/CSVHeaderAndTrailer.java 2006-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvheaderandtrailer/CSVHeaderAndTrailer.java 2006-11-27 13:27:43 UTC (rev 207) @@ -8,7 +8,7 @@ import java.io.File; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /** @@ -38,7 +38,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(mapFile, dataFile, ',', '\"', true); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); while (ds.next()) { if (ds.isRecordID("header")) { 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/csvperformancetest/CSVPerformanceTest.java 2006-11-27 13:27:43 UTC (rev 207) @@ -9,7 +9,7 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /* @@ -53,7 +53,7 @@ final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(filename), ',', '"'); long timeStarted = System.currentTimeMillis(); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); long timeFinished = System.currentTimeMillis(); String timeMessage = ""; 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-11-27 13:27:43 UTC (rev 207) @@ -12,7 +12,7 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -33,7 +33,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser( new File("PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '"'); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); // re order the data set by last name orderby = new OrderBy(); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-11-27 13:27:43 UTC (rev 207) @@ -9,7 +9,7 @@ import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -44,7 +44,7 @@ OrderBy orderby = null; final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), new File(data), ',', '"', true); - final IDataSet ds = pzparser.parse(); + final DataSet 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java 2006-11-27 13:27:43 UTC (rev 207) @@ -11,7 +11,7 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -44,7 +44,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), new File(data), ',', '"', true); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); // re order the data set by last name final OrderBy orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY", false)); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/exporttoexcel/DelimitedFileExportToExcel.java 2006-11-27 13:27:43 UTC (rev 207) @@ -10,7 +10,7 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.ordering.OrderColumn; @@ -44,7 +44,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), new File(data), ',', '"', true); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); // re order the data set by last name final OrderBy orderby = new OrderBy(); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java 2006-11-27 13:27:43 UTC (rev 207) @@ -9,7 +9,7 @@ import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /** @@ -37,7 +37,7 @@ public static void call(String mapping, String data) throws Exception { final PZParser pzparser = DefaultPZParserFactory.getInstance().newFixedLengthParser( new File(mapping), new File(data)); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); final String[] colNames = ds.getColumns(); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java 2006-11-27 13:27:43 UTC (rev 207) @@ -11,7 +11,7 @@ import net.sf.pzfilereader.DataError; import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /** @@ -41,7 +41,7 @@ DataError dataError = null; final PZParser pzparser = DefaultPZParserFactory.getInstance().newFixedLengthParser(new File(mapping), new File(data)); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); while (ds.next()) { 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/jsptableexample/pzfilereaderwebsamples/index.jsp 2006-11-27 13:27:43 UTC (rev 207) @@ -9,39 +9,39 @@ </head> <% - OrderBy order = null; - try{ - - File mappingFile = null; - File txtFile = null; - String appDirectory = null; - - //find out where this application is installed - appDirectory = getServletContext().getRealPath(""); - - mappingFile = new File (appDirectory + "/PEOPLE.pzmap.xml"); - txtFile = new File (appDirectory + "/PEOPLE.txt"); - - //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 - if (request.getParameter("orderby") != null && - request.getParameter("orderby").trim().length() > 0){ - - //sort the file by what was passed in the request - order = new OrderBy(); - order.addOrderColumn(new OrderColumn(request.getParameter("orderby"),false)); //set boolean to true for DESC sort - ds.orderRows(order); - - } - - }catch(Exception ex){ - out.println("Error: " + ex); - } + OrderBy order = null; + try{ + + File mappingFile = null; + File txtFile = null; + String appDirectory = null; + + //find out where this application is installed + appDirectory = getServletContext().getRealPath(""); + + mappingFile = new File (appDirectory + "/PEOPLE.pzmap.xml"); + txtFile = new File (appDirectory + "/PEOPLE.txt"); + + //read in the file + final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(mappingFile, + txtFile, ',', 0, false) ; + final DataSet ds = pzparser.parse(); + + + //check to see if there is a paramter in the request that is telling us what column to sort by + if (request.getParameter("orderby") != null && + request.getParameter("orderby").trim().length() > 0){ + + //sort the file by what was passed in the request + order = new OrderBy(); + order.addOrderColumn(new OrderColumn(request.getParameter("orderby"),false)); //set boolean to true for DESC sort + ds.orderRows(order); + + } + + }catch(Exception ex){ + out.println("Error: " + ex); + } %> <body> <table border="1"> Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java 2006-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/lowlevelparse/LowLevelParse.java 2006-11-27 13:27:43 UTC (rev 207) @@ -52,7 +52,7 @@ // text qualifier. The text qualifier is optional, it can be // null // or empty - elements = ParserUtils.splitLine(line, ',', '"'); + elements = ParserUtils.splitLine(line, ',', '"', 10); for (int i = 0; i < elements.size(); i++) { System.out.println("Column " + i + ": " + (String) elements.get(i)); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/multilinedelimitedrecord/DelimitedMultiLine.java 2006-11-27 13:27:43 UTC (rev 207) @@ -9,7 +9,7 @@ import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /** @@ -40,7 +40,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(data), ',', '\"'); - final IDataSet ds = pzparser.parse(); + final DataSet ds = pzparser.parse(); final String[] colNames = ds.getColumns(); 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-11-27 13:22:39 UTC (rev 206) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/numericsanddates/NumericsAndDates.java 2006-11-27 13:27:43 UTC (rev 207) @@ -10,7 +10,7 @@ import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.DefaultPZParserFactory; -import net.sf.pzfilereader.IDataSet; +import net.sf.pzfilereader.DataSet; import net.sf.pzfilereader.PZParser; /** @@ -43,7 +43,7 @@ // ignore first record final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File(mapping), new File(data), ',', '\"', true); - final IDataSet ds = pzparser.parse(); + final DataSet 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. |
From: <zep...@us...> - 2006-12-15 14:43:14
|
Revision: 223 http://svn.sourceforge.net/pzfilereader/?rev=223&view=rev Author: zepernick Date: 2006-12-15 06:43:13 -0800 (Fri, 15 Dec 2006) Log Message: ----------- fixed compilation errors from removal of LargeDataSet Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java 2006-12-15 14:43:13 UTC (rev 223) @@ -19,7 +19,7 @@ import net.sf.pzfilereader.examples.lowlevelparse.LowLevelParse; import net.sf.pzfilereader.examples.multilinedelimitedrecord.DelimitedMultiLine; import net.sf.pzfilereader.examples.numericsanddates.NumericsAndDates; -import net.sf.pzfilereader.util.BXParser; +import net.sf.pzfilereader.util.PZConstants; import net.sf.pzfilereader.util.ParserUtils; /** @@ -71,7 +71,7 @@ menu.addMenuItem("NumericsAndDates", "doNumericsAndDates", false); menu.addMenuItem("Ask for GC", "doGC", false); menu.addMenuItem("Test StringBuffer", "doStringBuffer", false); - menu.addMenuItem("Test Parsers", "doTestParsers", false); + menu.addMenuItem("Test Delim Parser Perform", "doTestParsers", false); menu.addMenuItem("Who you gonna call?", "doCall", false); menu.displayMenu(); @@ -251,7 +251,7 @@ } public void doTestParsers() { - final int repeat = ConsoleMenu.getInt("How many times?", 1000); + final int repeat = ConsoleMenu.getInt("How many Rows?", 1000); final int numberOfCols = ConsoleMenu.getInt("How many columns?", 100); final boolean qualif = ConsoleMenu.getBoolean("With qualifier?", true); @@ -270,28 +270,12 @@ long start = System.currentTimeMillis(); for (int i = 0; i < repeat; i++) { - ParserUtils.splitLine(line, ',', '\"'); + ParserUtils.splitLine(line, ',', '\"', PZConstants.SPLITLINE_SIZE_INIT); } long stop = System.currentTimeMillis(); System.out.println("ParserUtil " + (stop - start) + " ms."); - start = System.currentTimeMillis(); - for (int i = 0; i < repeat; i++) { - BXParser.splitLine(line, ',', '\"', numberOfCols); - } - stop = System.currentTimeMillis(); - - System.out.println("BXParser " + (stop - start) + " ms."); - - start = System.currentTimeMillis(); - for (int i = 0; i < repeat; i++) { - BXParser.splitLineWithBuf(line, ',', '\"', numberOfCols); - } - stop = System.currentTimeMillis(); - - System.out.println("BXParser with buf " + (stop - start) + " ms."); - } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-12-15 14:43:13 UTC (rev 223) @@ -8,7 +8,9 @@ import java.io.File; import java.io.FileInputStream; -import net.sf.pzfilereader.LargeDataSet; +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.brparse.BuffReaderDelimPZParser; +import net.sf.pzfilereader.brparse.BuffReaderPZParseFactory; /** * @author zepernick @@ -33,34 +35,41 @@ } public static void call(String mapping, String data) throws Exception { - LargeDataSet ds = null; String[] colNames = null; FileInputStream pzmap = null; FileInputStream fileToParse = null; - - pzmap = new FileInputStream(new File(mapping)); - fileToParse = new FileInputStream(new File(data)); - // delimited by a comma - // text qualified by double quotes - // ignore first record - ds = new LargeDataSet(pzmap, fileToParse, ',', '"', true, false); - - 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])); + BuffReaderDelimPZParser pzparse = null; + try { + pzmap = new FileInputStream(new File(mapping)); + fileToParse = new FileInputStream(new File(data)); + // delimited by a comma + // text qualified by double quotes + // ignore first record + + pzparse = (BuffReaderDelimPZParser)BuffReaderPZParseFactory.getInstance().newDelimitedParser(pzmap, + fileToParse, ',', '"', true); + + final DataSet ds = pzparse.parse(); + + 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])); + } + + System.out.println("==========================================================================="); } - - System.out.println("==========================================================================="); + + if (ds.getErrors() != null && ds.getErrors().size() > 0) { + System.out.println("FOUND ERRORS IN FILE"); + } + + } finally { + // free up the file readers + pzparse.close(); + } - if (ds.getErrors() != null && ds.getErrors().size() > 0) { - System.out.println("FOUND ERRORS IN FILE"); - } - - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 2006-12-15 14:43:13 UTC (rev 223) @@ -8,7 +8,6 @@ import java.io.File; import java.io.FileInputStream; -import net.sf.pzfilereader.LargeDataSet; /** * @author zepernick @@ -32,7 +31,8 @@ } public static void call(String mapping, String data) throws Exception { - LargeDataSet ds = null; + System.out.println("Not Currently Available...Check back later."); + /* LargeDataSet ds = null; String[] colNames = null; ds = new LargeDataSet(new FileInputStream(new File(mapping)), new FileInputStream(new File(data)), false); @@ -48,7 +48,7 @@ } // clear out the DataSet object for the JVM to collect - ds.freeMemory(); + ds.freeMemory();*/ } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-12-15 14:43:13 UTC (rev 223) @@ -7,7 +7,9 @@ import java.util.Map; import net.sf.pzfilereader.DataError; -import net.sf.pzfilereader.LargeDataSet; +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.brparse.BuffReaderDelimPZParser; +import net.sf.pzfilereader.brparse.BuffReaderPZParseFactory; /* * Created on Dec 1, 2005 @@ -40,15 +42,17 @@ } public static void call(String data) throws Exception { - LargeDataSet ds = null; + BuffReaderDelimPZParser pzparse = null; try { // delimited by a comma // text qualified by double quotes // ignore first record - ds = new LargeDataSet(new File(data), ',', '"', false); - + pzparse = (BuffReaderDelimPZParser)BuffReaderPZParseFactory.getInstance().newDelimitedParser(new File(data), + ',', '"'); + + final DataSet ds = pzparse.parse(); final long timeStarted = System.currentTimeMillis(); int totalCount = 0; int tmpCount = 0; @@ -80,11 +84,10 @@ System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); } } - - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); } catch (final Exception ex) { ex.printStackTrace(); + } finally { + pzparse.close(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |