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. |