You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(112) |
Nov
(44) |
Dec
(49) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(14) |
Feb
(12) |
Mar
(12) |
Apr
(12) |
May
(6) |
Jun
(11) |
Jul
(10) |
Aug
(6) |
Sep
(17) |
Oct
(3) |
Nov
(22) |
Dec
|
2008 |
Jan
(3) |
Feb
(7) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
(1) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(2) |
Dec
|
2011 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
2012 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <zep...@us...> - 2006-12-16 18:04:06
|
Revision: 240 http://svn.sourceforge.net/pzfilereader/?rev=240&view=rev Author: zepernick Date: 2006-12-16 10:04:03 -0800 (Sat, 16 Dec 2006) Log Message: ----------- Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2006-12-16 17:57:34 UTC (rev 239) +++ trunk/src/site/changes.xml 2006-12-16 18:04:03 UTC (rev 240) @@ -8,6 +8,8 @@ </properties> <body> <release version="2.3.0" date="in svn" description="Move to Maven and Subversion"> + <action dev="zepernick" type="change">Removed ParserUtils.getColumnMDFromFile(InputStream, String, String) this method + was depricated in 2.2</action> <action dev="zepernick" type="change">Removed setters and default constructor from DataError. Error properties are set through the new constructor.</action> <action dev="zepernick" type="add">added the ability to limit the column which are exported to Excel in the ExcelTransformer class</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 17:57:33
|
Revision: 239 http://svn.sourceforge.net/pzfilereader/?rev=239&view=rev Author: zepernick Date: 2006-12-16 09:57:34 -0800 (Sat, 16 Dec 2006) Log Message: ----------- pbd fixes Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 17:51:25 UTC (rev 238) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 17:57:34 UTC (rev 239) @@ -34,7 +34,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-16 17:51:25 UTC (rev 238) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-16 17:57:34 UTC (rev 239) @@ -182,7 +182,9 @@ } /** - * Returns the meta data describing the columns + * Returns the meta data describing the columns. + * This exposes this method to the DataSet which + * it could not otherwise see because it is protected. */ public Map getColumnMD() { return super.getColumnMD(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 17:51:26
|
Revision: 238 http://svn.sourceforge.net/pzfilereader/?rev=238&view=rev Author: zepernick Date: 2006-12-16 09:51:25 -0800 (Sat, 16 Dec 2006) Log Message: ----------- findbug fixes Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderColumn.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/structure/Row.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/FixedWidthParserUtils.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 17:51:25 UTC (rev 238) @@ -91,22 +91,16 @@ try { stream = ParserUtils.createInputStream(getDataSource()); return doDelimitedFile(stream, shouldCreateMDFromFile()); - } catch (final Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); } finally { if (stream != null) { stream.close(); } } } - } catch (final FileNotFoundException e) { - // TODO Auto-generated catch block + } catch (final IOException e) { + // TODO add logger e.printStackTrace(); - } catch (final Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + } return null; } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2006-12-16 17:51:25 UTC (rev 238) @@ -65,10 +65,12 @@ try { final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON " - + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO " + "WHERE DATAFILE.DATAFILE_DESC = '" - + getDataDefinition() + "' " + "ORDER BY DATASTRUCTURE_COL_ORDER"; + + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO " + + "WHERE DATAFILE.DATAFILE_DESC = ? " + + "ORDER BY DATASTRUCTURE_COL_ORDER"; stmt = con.prepareStatement(sql); // always use PreparedStatement + stmt.setString(1, getDataDefinition()); // as the DB can do clever things. rs = stmt.executeQuery(); Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-12-16 17:51:25 UTC (rev 238) @@ -70,11 +70,13 @@ try { final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON " - + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO " + "WHERE DATAFILE.DATAFILE_DESC = '" - + getDataDefinition() + "' " + "ORDER BY DATASTRUCTURE_COL_ORDER"; + + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO " + + "WHERE DATAFILE.DATAFILE_DESC = ? " + + "ORDER BY DATASTRUCTURE_COL_ORDER"; stmt = con.prepareStatement(sql); // always use PreparedStatement // as the DB can do clever things. + stmt.setString(1, getDataDefinition()); rs = stmt.executeQuery(); int recPosition = 1; Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 17:51:25 UTC (rev 238) @@ -1,22 +1,42 @@ /* - Copyright 2006 Paul Zepernick - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package net.sf.pzfilereader.ordering; +import java.io.Serializable; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Locale; import net.sf.pzfilereader.structure.Row; import net.sf.pzfilereader.util.PZConstants; @@ -30,7 +50,9 @@ * * @version 2.0 */ -public class OrderBy implements Comparator { +public class OrderBy implements Comparator, Serializable { + private static final long serialVersionUID = 5622406168247149895L; + /** collection of order elements to sort by */ private final ArrayList orderbys = new ArrayList(); @@ -77,8 +99,10 @@ // convert to one type of case so the comparator does not take case // into account when sorting - final Comparable comp0 = row0.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase(); - final Comparable comp1 = row1.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase(); + final Comparable comp0 = row0.getValue(ParserUtils.findColumn( + oc.getColumnName(), columnMD)).toLowerCase(Locale.getDefault()); + final Comparable comp1 = row1.getValue(ParserUtils.findColumn( + oc.getColumnName(), columnMD)).toLowerCase(Locale.getDefault()); // multiply by the sort indicator to get a ASC or DESC result result = comp0.compareTo(comp1) * oc.getSortIndicator(); Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderColumn.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderColumn.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderColumn.java 2006-12-16 17:51:25 UTC (rev 238) @@ -1,16 +1,34 @@ /* - Copyright 2006 Paul Zepernick - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package net.sf.pzfilereader.ordering; Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/structure/Row.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/structure/Row.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/structure/Row.java 2006-12-16 17:51:25 UTC (rev 238) @@ -29,10 +29,19 @@ private List cols; /** Row number in flat file */ - private int rowNumber = 0; + private int rowNumber; /** key to the MD for this row, null will indicate it is "detail" MD */ private String mdkey; + + /** + * Constructs a new Row + * + */ + public Row() { + mdkey = null; + cols = new ArrayList(); + } /** * Adds a column to a row @@ -41,9 +50,6 @@ * String value to add to the row */ public void addColumn(final String colValue) { - if (cols == null) { - cols = new ArrayList(); - } cols.add(colValue); } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/FixedWidthParserUtils.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/FixedWidthParserUtils.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/FixedWidthParserUtils.java 2006-12-16 17:51:25 UTC (rev 238) @@ -36,6 +36,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import net.sf.pzfilereader.structure.ColumnMetaData; import net.sf.pzfilereader.xml.XMLRecordElement; @@ -86,16 +87,16 @@ // detail id return PZConstants.DETAIL_ID; } - final Iterator keys = columnMD.keySet().iterator(); + final Iterator mapEntries = columnMD.entrySet().iterator(); // loop through the XMLRecordElement objects and see if we need a // different MD object - while (keys.hasNext()) { - final String key = (String) keys.next(); - if (key.equals(PZConstants.DETAIL_ID) || key.equals(PZConstants.COL_IDX)) { + while (mapEntries.hasNext()) { + final Entry entry = (Entry) mapEntries.next(); + if (entry.getKey().equals(PZConstants.DETAIL_ID) || entry.getKey().equals(PZConstants.COL_IDX)) { continue; // skip this key will be assumed if none of the // others match } - final XMLRecordElement recordXMLElement = (XMLRecordElement) columnMD.get(key); + final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue(); if (recordXMLElement.getEndPositition() > line.length()) { // make sure our substring is not going to fail @@ -107,7 +108,7 @@ final int subto = recordXMLElement.getEndPositition(); if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) { // we found the MD object we want to return - return key; + return (String)entry.getKey(); } } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 17:51:25 UTC (rev 238) @@ -50,6 +50,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Properties; +import java.util.Map.Entry; import net.sf.pzfilereader.converter.PZConvertException; import net.sf.pzfilereader.converter.PZConverter; @@ -588,13 +589,13 @@ final Map recordLengths = new HashMap(); List cmds = null; - final Iterator columnMDIt = columnMD.keySet().iterator(); + final Iterator columnMDIt = columnMD.entrySet().iterator(); while (columnMDIt.hasNext()) { - final String key = (String) columnMDIt.next(); - if (key.equals(PZConstants.DETAIL_ID) || key.equals(PZConstants.COL_IDX)) { - cmds = (List) columnMD.get(PZConstants.DETAIL_ID); + final Entry entry = (Entry) columnMDIt.next(); + if (entry.getKey().equals(PZConstants.DETAIL_ID) || entry.getKey().equals(PZConstants.COL_IDX)) { + cmds = (List) entry.getValue(); } else { - cmds = ((XMLRecordElement) columnMD.get(key)).getColumns(); + cmds = ((XMLRecordElement) entry.getValue()).getColumns(); } int recordLength = 0; @@ -602,7 +603,7 @@ recordLength += ((ColumnMetaData) cmds.get(i)).getColLength(); } - recordLengths.put(key, new Integer(recordLength)); + recordLengths.put(entry.getKey(), new Integer(recordLength)); } @@ -622,40 +623,7 @@ * */ public static String getCMDKeyForFixedLengthFile(final Map columnMD, final String line) { - if (columnMD.size() == 1) { - // no <RECORD> elments were specifed for this parse, just return the - // detail id - return PZConstants.DETAIL_ID; - } - final Iterator keys = columnMD.keySet().iterator(); - // loop through the XMLRecordElement objects and see if we need a - // different MD object - while (keys.hasNext()) { - final String key = (String) keys.next(); - if (key.equals(PZConstants.DETAIL_ID) || key.equals(PZConstants.COL_IDX)) { - continue; // skip this key will be assumed if none of the - // others match - } - final XMLRecordElement recordXMLElement = (XMLRecordElement) columnMD.get(key); - - if (recordXMLElement.getEndPositition() > line.length()) { - // make sure our substring is not going to fail - continue; - } - final int subfrm = recordXMLElement.getStartPosition() - 1; // convert - // to 0 - // based - final int subto = recordXMLElement.getEndPositition(); - if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) { - // we found the MD object we want to return - return key; - } - - } - - // must be a detail line - return PZConstants.DETAIL_ID; - + return FixedWidthParserUtils.getCMDKey(columnMD, line); } /** @@ -673,16 +641,16 @@ // detail id return PZConstants.DETAIL_ID; } - final Iterator keys = columnMD.keySet().iterator(); + final Iterator mapEntries = columnMD.entrySet().iterator(); // loop through the XMLRecordElement objects and see if we need a // different MD object - while (keys.hasNext()) { - final String key = (String) keys.next(); - if (key.equals(PZConstants.DETAIL_ID) || key.equals(PZConstants.COL_IDX)) { + while (mapEntries.hasNext()) { + final Entry entry = (Entry) mapEntries.next(); + if (entry.getKey().equals(PZConstants.DETAIL_ID) || entry.getKey().equals(PZConstants.COL_IDX)) { continue; // skip this key will be assumed if none of the // others match } - final XMLRecordElement recordXMLElement = (XMLRecordElement) columnMD.get(key); + final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue(); if (recordXMLElement.getElementNumber() > lineElements.size()) { // make sure the element referenced in the mapping exists @@ -691,7 +659,7 @@ final String lineElement = (String) lineElements.get(recordXMLElement.getElementNumber() - 1); if (lineElement.equals(recordXMLElement.getIndicator())) { // we found the MD object we want to return - return key; + return (String)entry.getKey(); } } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java 2006-12-16 17:51:25 UTC (rev 238) @@ -1,16 +1,34 @@ /* - Copyright 2006 Paul Zepernick - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package net.sf.pzfilereader.xml; @@ -22,6 +40,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import net.sf.pzfilereader.structure.ColumnMetaData; import net.sf.pzfilereader.util.PZConstants; @@ -188,17 +207,19 @@ public static void setDebug(final boolean b) { showDebug = b; } - + + //TODO convert to logger instead of system out private static void showDebug(final Map xmlResults) { - final Iterator mapIt = xmlResults.keySet().iterator(); + final Iterator mapIt = xmlResults.entrySet().iterator(); while (mapIt.hasNext()) { XMLRecordElement xmlrecEle = null; - final String recordID = (String) mapIt.next(); + final Entry entry = (Entry)mapIt.next(); + final String recordID = (String) entry.getKey(); Iterator columns = null; if (recordID.equals(PZConstants.DETAIL_ID)) { - columns = ((List) xmlResults.get(recordID)).iterator(); + columns = ((List) entry.getValue()).iterator(); } else { - xmlrecEle = (XMLRecordElement) xmlResults.get(recordID); + xmlrecEle = (XMLRecordElement) entry.getValue(); columns = xmlrecEle.getColumns().iterator(); } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java 2006-12-16 16:53:07 UTC (rev 237) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java 2006-12-16 17:51:25 UTC (rev 238) @@ -1,32 +1,52 @@ /* - Copyright 2006 Paul Zepernick - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package net.sf.pzfilereader.xml; import java.io.IOException; import java.net.URL; +import java.util.Locale; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /** - * @author zepernick + * Resolves a local copy of the DTD instead of having to pull + * over the internet from the SF site * - * Resolves a local copy of the DTD instead of having to pull from SF + * @author Paul Zepernick */ -public class ResolveLocalDTD implements EntityResolver { +public final class ResolveLocalDTD implements EntityResolver { /* * (non-Javadoc) @@ -35,18 +55,14 @@ * java.lang.String) */ public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException { - try { - if (!systemId.toLowerCase().startsWith("http://")) { - final URL resource = getClass().getResource("pzfilereader.dtd"); + if (!systemId.toLowerCase(Locale.getDefault()).startsWith("http://")) { + final URL resource = getClass().getResource("pzfilereader.dtd"); - if (resource != null) { - return new InputSource(resource.openStream()); - } else { - throw new Exception("could not load dtd resource!!"); - } + if (resource != null) { + return new InputSource(resource.openStream()); + } else { + throw new RuntimeException("could not load dtd resource from jar!!"); } - } catch (final Exception ex) { - ex.printStackTrace(); } // must be pulling from the web, stick with default implementation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 16:53:06
|
Revision: 237 http://svn.sourceforge.net/pzfilereader/?rev=237&view=rev Author: zepernick Date: 2006-12-16 08:53:07 -0800 (Sat, 16 Dec 2006) Log Message: ----------- fixed constructors for pzmaps Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-16 16:27:29 UTC (rev 236) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-16 16:53:07 UTC (rev 237) @@ -57,12 +57,12 @@ public BuffReaderDelimPZParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier, final boolean ignoreFirstRecord) { - super(dataSource, delimiter, qualifier, ignoreFirstRecord); + super(pzmapXML, dataSource, delimiter, qualifier, ignoreFirstRecord); } public BuffReaderDelimPZParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream, final char delimiter, final char qualifier, final boolean ignoreFirstRecord) { - super(dataSourceStream, delimiter, qualifier, ignoreFirstRecord); + super(pzmapXMLStream, dataSourceStream, delimiter, qualifier, ignoreFirstRecord); } public BuffReaderDelimPZParser(final File dataSource, final char delimiter, final char qualifier, final boolean ignoreFirstRecord) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 16:27:29
|
Revision: 236 http://svn.sourceforge.net/pzfilereader/?rev=236&view=rev Author: zepernick Date: 2006-12-16 08:27:29 -0800 (Sat, 16 Dec 2006) Log Message: ----------- checkstyle fixes Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java 2006-12-16 16:23:41 UTC (rev 235) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java 2006-12-16 16:27:29 UTC (rev 236) @@ -71,7 +71,7 @@ super(dataSourceStream, delimiter, qualifier, ignoreFirstRecord); } - protected void init() throws InitialisationException { + protected void init() { try { if (pzmapXMLStream != null) { setColumnMD(PZMapParser.parse(pzmapXMLStream)); Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java 2006-12-16 16:23:41 UTC (rev 235) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java 2006-12-16 16:27:29 UTC (rev 236) @@ -60,7 +60,7 @@ this.pzmapXML = pzmapXML; } - protected void init() throws InitialisationException { + protected void init() { try { if (pzmapXMLStream != null) { setColumnMD(PZMapParser.parse(pzmapXMLStream)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 16:23:46
|
Revision: 235 http://svn.sourceforge.net/pzfilereader/?rev=235&view=rev Author: zepernick Date: 2006-12-16 08:23:41 -0800 (Sat, 16 Dec 2006) Log Message: ----------- fixed bug r variable was not getting set Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 15:29:07 UTC (rev 234) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 16:23:41 UTC (rev 235) @@ -65,9 +65,9 @@ Row r = null; if (brDelimPzParser != null) { - brDelimPzParser.buildRow(this); + r = brDelimPzParser.buildRow(this); } else if (brFixedPzParser != null) { - brFixedPzParser.buildRow(this); + r = brFixedPzParser.buildRow(this); } else { //this should not happen, throw exception throw new RuntimeException("No parser available to fetch row"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 15:29:07
|
Revision: 234 http://svn.sourceforge.net/pzfilereader/?rev=234&view=rev Author: zepernick Date: 2006-12-16 07:29:07 -0800 (Sat, 16 Dec 2006) Log Message: ----------- removed 1.5 only StringBuilder Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.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-16 15:15:30 UTC (rev 233) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java 2006-12-16 15:29:07 UTC (rev 234) @@ -255,7 +255,7 @@ final int numberOfCols = ConsoleMenu.getInt("How many columns?", 100); final boolean qualif = ConsoleMenu.getBoolean("With qualifier?", true); - StringBuilder aRow = new StringBuilder(); + StringBuffer aRow = new StringBuffer(); for (int i = 0; i < numberOfCols; i++) { if (qualif) { aRow.append("\""); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 15:15:32
|
Revision: 233 http://svn.sourceforge.net/pzfilereader/?rev=233&view=rev Author: zepernick Date: 2006-12-16 07:15:30 -0800 (Sat, 16 Dec 2006) Log Message: ----------- cleaned up most of the checkstyle errors. There are still a couple out there that I am not sure how to deal with exactly Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-16 15:15:30 UTC (rev 233) @@ -38,10 +38,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; import java.util.List; import java.util.Map; -import java.util.Properties; import net.sf.pzfilereader.structure.Row; import net.sf.pzfilereader.util.FixedWidthParserUtils; Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 15:15:30 UTC (rev 233) @@ -1,16 +1,34 @@ /* - Copyright 2006 Paul Zepernick - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package net.sf.pzfilereader; @@ -21,18 +39,21 @@ * @version 2.0 */ public class DataError { + final private String errorDesc; - /** Description of error. */ - private String errorDesc; + final private int lineNo; - /** line number in file error occured on. */ - private int lineNo; + final private int errorLevel; /** - * Severity of the error 1 = Warning 2 = Moderate 3 = Severe. + * + * @param errorDesc + * Text description of the error that occured + * @param lineNo + * Line number in the data file the error occured on + * @param errorLevel + * Level of the error (1=warning, 2=moderate, 3=severe) */ - private int errorLevel; - public DataError(final String errorDesc, final int lineNo, final int errorLevel) { this.errorDesc = errorDesc; this.lineNo = lineNo; @@ -40,13 +61,6 @@ } /** - * @deprecated should use the ctor with fields - * - */ - public DataError() { - } - - /** * Returns the errorDesc. * * @return String @@ -72,37 +86,4 @@ public int getLineNo() { return lineNo; } - - /** - * Sets the errorDesc. - * - * @param errorDesc - * The errorDesc to set - * @deprecated the DataError should be immutable (i.e. no Set method) - */ - public void setErrorDesc(final String errorDesc) { - this.errorDesc = errorDesc; - } - - /** - * Sets the errorLevel. - * - * @param errorLevel - * The errorLevel to set - * @deprecated the DataError should be immutable (i.e. no Set method) - */ - public void setErrorLevel(final int errorLevel) { - this.errorLevel = errorLevel; - } - - /** - * Sets the lineNo. - * - * @param lineNo - * The lineNo to set - * @deprecated the DataError should be immutable (i.e. no Set method) - */ - public void setLineNo(final int lineNo) { - this.lineNo = lineNo; - } } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-16 15:15:30 UTC (rev 233) @@ -42,8 +42,6 @@ import java.util.Map; import java.util.Properties; -import net.sf.pzfilereader.converter.PZConvertException; -import net.sf.pzfilereader.converter.PZConverter; import net.sf.pzfilereader.ordering.OrderBy; import net.sf.pzfilereader.structure.ColumnMetaData; import net.sf.pzfilereader.structure.Row; Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 15:15:30 UTC (rev 233) @@ -35,28 +35,29 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; -import java.util.TreeMap; import net.sf.pzfilereader.DefaultDataSet; import net.sf.pzfilereader.structure.Row; public class BuffReaderPZDataSet extends DefaultDataSet{ - private BuffReaderDelimPZParser brDelimPzParser; + private final BuffReaderDelimPZParser brDelimPzParser; - private BuffReaderFixedPZParser brFixedPzParser; + private final BuffReaderFixedPZParser brFixedPzParser; public BuffReaderPZDataSet(final Map columnMD2, BuffReaderDelimPZParser brDelimPzParser) { super(columnMD2); //register the parser with the dataset so we can fetch rows from //the bufferedreader as needed - this.brDelimPzParser = brDelimPzParser; + this.brDelimPzParser = brDelimPzParser; + this.brFixedPzParser = null; } public BuffReaderPZDataSet(final Map columnMD2, BuffReaderFixedPZParser brFixedPzParser) { super(columnMD2); //register the parser with the dataset so we can fetch rows from //the bufferedreader as needed - this.brFixedPzParser = brFixedPzParser; + this.brFixedPzParser = brFixedPzParser; + this.brDelimPzParser = null; } public boolean next() { Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 15:15:30 UTC (rev 233) @@ -57,6 +57,7 @@ public int compare(final Object arg0, final Object arg1) { final Row row0 = (Row) arg0; final Row row1 = (Row) arg1; + int result = 0; for (int i = 0; i < orderbys.size(); i++) { final OrderColumn oc = (OrderColumn) orderbys.get(i); @@ -70,10 +71,8 @@ // keep headers / trailers in the same order at the bottom of // the DataSet return 0; - } else if (!mdkey0.equals(PZConstants.DETAIL_ID)) { - return 1; - } else if (!mdkey1.equals(PZConstants.DETAIL_ID)) { - return 0; + } else if (!mdkey0.equals(PZConstants.DETAIL_ID) || !mdkey1.equals(PZConstants.DETAIL_ID)) { + return !mdkey0.equals(PZConstants.DETAIL_ID) ? 1 : 0; } // convert to one type of case so the comparator does not take case @@ -81,25 +80,17 @@ final Comparable comp0 = row0.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase(); final Comparable comp1 = row1.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase(); - // + BX will never be equal to null. - // if (comp0 == null) { - // comp0 = new String(""); - // } - // if (comp1 == null) { - // comp1 = new String(""); - // } - // multiply by the sort indicator to get a ASC or DESC result - final int result = comp0.compareTo(comp1) * oc.getSortIndicator(); + result = comp0.compareTo(comp1) * oc.getSortIndicator(); // if it is = 0 then the primary sort is done, and it can start the // secondary sorts if (result != 0) { - return result; + break; } } - return 0; + return result; } /** Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 14:48:21 UTC (rev 232) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 15:15:30 UTC (rev 233) @@ -102,7 +102,7 @@ * intial capacity of the List size * @return List */ - public static List splitLine(String line, final char delimiter, final char qualifier, int initialSize) { + public static List splitLine(final String line, final char delimiter, final char qualifier, int initialSize) { List list = new ArrayList(initialSize); if (delimiter == 0) { @@ -130,7 +130,6 @@ for (int i = 0; i < size; i++) { final char currentChar = trimmedLine.charAt(i); - //System.out.println(currentChar); if (currentChar != delimiter && currentChar != qualifier) { previousChar = currentChar; endBlock = i + 1; @@ -728,17 +727,10 @@ public static int getColumnIndex(final String key, final Map columnMD, final String colName) { int idx = -1; if (key != null && !key.equals(PZConstants.DETAIL_ID) && !key.equals(PZConstants.COL_IDX)) { - // if ("header".equals(key)) { - // System.out.println("Columsn====header == "+ ((XMLRecordElement) - // columnMD.get(key)).getColumns()); - // } idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(colName); } else if (key == null || key.equals(PZConstants.DETAIL_ID)) { final Map map = (Map) columnMD.get(PZConstants.COL_IDX); - // System.out.println("Map == " + map); - // System.out.println("look for == " + colName); idx = ((Integer) map.get(colName)).intValue(); - // System.out.println("-------------> " + idx); } if (idx < 0) { @@ -770,8 +762,11 @@ */ public static void closeReader(final Reader reader) { try { - reader.close(); - } catch (final Exception ignore) { + if (reader != null) { + reader.close(); + } + } catch (final IOException ex) { + throw new RuntimeException(ex); } } @@ -783,8 +778,11 @@ */ public static void closeReader(final InputStream reader) { try { - reader.close(); - } catch (final Exception ignore) { + if (reader != null) { + reader.close(); + } + } catch (final IOException ex) { + throw new RuntimeException(ex); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 14:48:24
|
Revision: 232 http://svn.sourceforge.net/pzfilereader/?rev=232&view=rev Author: zepernick Date: 2006-12-16 06:48:21 -0800 (Sat, 16 Dec 2006) Log Message: ----------- Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2006-12-16 14:41:28 UTC (rev 231) +++ trunk/src/site/changes.xml 2006-12-16 14:48:21 UTC (rev 232) @@ -8,6 +8,8 @@ </properties> <body> <release version="2.3.0" date="in svn" description="Move to Maven and Subversion"> + <action dev="zepernick" type="change">Removed setters and default constructor from DataError. Error properties + are set through the new constructor.</action> <action dev="zepernick" type="add">added the ability to limit the column which are exported to Excel in the ExcelTransformer class</action> <action dev="zepernick" type="add">added getObject(String column, Class toConvert) method. PZFileReader will ship with default classes to handle conversions. Custom conversions can be easily added by adding to the pzconvert.properties</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 14:41:32
|
Revision: 231 http://svn.sourceforge.net/pzfilereader/?rev=231&view=rev Author: zepernick Date: 2006-12-16 06:41:28 -0800 (Sat, 16 Dec 2006) Log Message: ----------- checkstyle fixes Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 14:10:23 UTC (rev 230) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-16 14:41:28 UTC (rev 231) @@ -38,9 +38,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; import java.util.List; -import java.util.Properties; import net.sf.pzfilereader.structure.Row; import net.sf.pzfilereader.util.PZConstants; @@ -87,14 +85,12 @@ try { lineCount = 0; if (getDataSourceStream() != null) { - return doDelimitedFile(getDataSourceStream(), getDelimiter(), getQualifier(), isIgnoreFirstRecord(), - shouldCreateMDFromFile()); + return doDelimitedFile(getDataSourceStream(), shouldCreateMDFromFile()); } else { InputStream stream = null; try { stream = ParserUtils.createInputStream(getDataSource()); - return doDelimitedFile(stream, getDelimiter(), getQualifier(), isIgnoreFirstRecord(), - shouldCreateMDFromFile()); + return doDelimitedFile(stream, shouldCreateMDFromFile()); } catch (final Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -151,8 +147,7 @@ * puts together the dataset for a DELIMITED file. This is used for PZ XML * mappings, and SQL table mappings */ - private DataSet doDelimitedFile(final InputStream dataSource, final char delimiter, final char qualifier, - final boolean ignoreFirstRecord, final boolean createMDFromFile) throws IOException { + private DataSet doDelimitedFile(final InputStream dataSource, final boolean createMDFromFile) throws IOException { if (dataSource == null) { throw new NullPointerException("dataSource is null"); } @@ -173,9 +168,9 @@ boolean processedFirst = false; /** loop through each line in the file */ String line = null; - while ((line = fetchNextRecord(br, qualifier, delimiter)) != null) { + while ((line = fetchNextRecord(br, getQualifier(), getDelimiter())) != null) { // check to see if the user has elected to skip the first record - if (!processedFirst && ignoreFirstRecord) { + if (!processedFirst && isIgnoreFirstRecord()) { processedFirst = true; continue; } else if (!processedFirst && createMDFromFile) { @@ -191,7 +186,7 @@ //is it going to create too much overhead to do a null check here as well??? //final int intialSize = ParserUtils.getColumnMetaData(PZConstants.DETAIL_ID, getColumnMD()).size(); // column values - final List columns = ParserUtils.splitLine(line, delimiter, qualifier, PZConstants.SPLITLINE_SIZE_INIT); + final List columns = ParserUtils.splitLine(line, getDelimiter(), getQualifier(), PZConstants.SPLITLINE_SIZE_INIT); final String mdkey = ParserUtils.getCMDKeyForDelimitedFile(getColumnMD(), columns); final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD()); final int columnCount = cmds.size(); @@ -245,21 +240,26 @@ * * @param br * Open reader being used to read through the file + * @param qual + * Qualifier being used for parse + * @parma delim + * Delimiter being used for parse * @return String * Record from delimited file * */ - protected String fetchNextRecord(final BufferedReader br, final char qualifier, - final char delimiter) throws IOException{ + protected String fetchNextRecord(final BufferedReader br, final char qual, + final char delim) throws IOException{ String line = null; String lineData = ""; boolean processingMultiLine = false; while ((line = br.readLine()) != null) { lineCount++; - /** empty line skip past it */ final String trimmed = line.trim(); if (!processingMultiLine && trimmed.length() == 0) { + //empty line skip past it, as long as it + //is not part of the multiline continue; } @@ -269,8 +269,8 @@ // be checked if we have specified a delimiter // ******************************************************** final char[] chrArry = trimmed.toCharArray(); - if (!processingMultiLine && delimiter > 0) { - processingMultiLine = ParserUtils.isMultiLine(chrArry, delimiter, qualifier); + if (!processingMultiLine && delim > 0) { + processingMultiLine = ParserUtils.isMultiLine(chrArry, delim, qual); } // check to see if we have reached the end of the linebreak in @@ -283,24 +283,15 @@ // excel will escape these with another quote; here is some // data "" This would indicate // there is more to the multiline - if (trimmed.charAt(trimmed.length() - 1) == qualifier && !trimmed.endsWith("" + qualifier + qualifier)) { + if (trimmed.charAt(trimmed.length() - 1) == qual && !trimmed.endsWith("" + qual + qual)) { // it is safe to assume we have reached the end of the // line break processingMultiLine = false; - if (trimmedLineData.length() > 0) { // + would always be - // true surely.... - lineData += "\r\n"; - } - lineData += line; + lineData += "\r\n" + line; } else { // check to see if this is the last line of the record // looking for a qualifier followed by a delimiter - if (trimmedLineData.length() > 0) { // + here again, - // this should - // always be true... - lineData += "\r\n"; - } - lineData += line; + lineData += "\r\n" + line; boolean qualiFound = false; for (int i = 0; i < chrArry.length; i++) { if (qualiFound) { @@ -311,19 +302,19 @@ // delimiter, then we have reached the end // of // the record - if (chrArry[i] == delimiter) { + if (chrArry[i] == delim) { // processingMultiLine = false; // fix put in, setting to false caused // bug when processing multiple // multi-line // columns on the same record - processingMultiLine = ParserUtils.isMultiLine(chrArry, delimiter, qualifier); + processingMultiLine = ParserUtils.isMultiLine(chrArry, delim, qual); break; } qualiFound = false; continue; } - } else if (chrArry[i] == qualifier) { + } else if (chrArry[i] == qual) { qualiFound = true; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-16 14:10:27
|
Revision: 230 http://svn.sourceforge.net/pzfilereader/?rev=230&view=rev Author: zepernick Date: 2006-12-16 06:10:23 -0800 (Sat, 16 Dec 2006) Log Message: ----------- Added Paths: ----------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java Added: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java (rev 0) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 14:10:23 UTC (rev 230) @@ -0,0 +1,102 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package net.sf.pzfilereader.brparse; + +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; + +import net.sf.pzfilereader.DefaultDataSet; +import net.sf.pzfilereader.structure.Row; + +public class BuffReaderPZDataSet extends DefaultDataSet{ + private BuffReaderDelimPZParser brDelimPzParser; + + private BuffReaderFixedPZParser brFixedPzParser; + + public BuffReaderPZDataSet(final Map columnMD2, BuffReaderDelimPZParser brDelimPzParser) { + super(columnMD2); + //register the parser with the dataset so we can fetch rows from + //the bufferedreader as needed + this.brDelimPzParser = brDelimPzParser; + } + + public BuffReaderPZDataSet(final Map columnMD2, BuffReaderFixedPZParser brFixedPzParser) { + super(columnMD2); + //register the parser with the dataset so we can fetch rows from + //the bufferedreader as needed + this.brFixedPzParser = brFixedPzParser; + } + + public boolean next() { + try { + Row r = null; + + if (brDelimPzParser != null) { + brDelimPzParser.buildRow(this); + } else if (brFixedPzParser != null) { + brFixedPzParser.buildRow(this); + } else { + //this should not happen, throw exception + throw new RuntimeException("No parser available to fetch row"); + } + + + if (r == null) { + setPointer(-1); + return false; + } + + //make sure we have some MD + if (getColumnMD() == null) { + //create a new map so the user cannot change the internal + //DataSet representation of the MD through the parser + setColumnMD(new LinkedHashMap(brDelimPzParser.getColumnMD())); + } + + clearRows(); + addRow(r); + + setPointer(0); + + return true; + + } catch(IOException ex) { + //TODO real logging here + ex.printStackTrace(); + } + + return false; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-12-16 11:46:05
|
Revision: 229 http://svn.sourceforge.net/pzfilereader/?rev=229&view=rev Author: benoitx Date: 2006-12-16 03:46:00 -0800 (Sat, 16 Dec 2006) Log Message: ----------- Use the same CSS as the rest of Objectlab family (statSVN behaving strangely with the other one) Modified Paths: -------------- trunk/PZFileReader/qalab.xml trunk/PZFileReaderSamples/qalab.xml trunk/common-build/project.properties trunk/statsvn.bat Added Paths: ----------- trunk/PZFileReader/src/site/style/ trunk/PZFileReader/src/site/style/maven-objectlabkit.css trunk/PZFileReaderSamples/src/site/style/ trunk/PZFileReaderSamples/src/site/style/maven-objectlabkit.css trunk/src/site/style/ trunk/src/site/style/maven-objectlabkit.css Property Changed: ---------------- trunk/src/site/statsvn/ Modified: trunk/PZFileReader/qalab.xml =================================================================== --- trunk/PZFileReader/qalab.xml 2006-12-15 23:15:22 UTC (rev 228) +++ trunk/PZFileReader/qalab.xml 2006-12-16 11:46:00 UTC (rev 229) @@ -4,81 +4,170 @@ <!ELEMENT summary (summaryresult*)> <!ELEMENT file (result+)> <!ATTLIST file id ID #REQUIRED> +<!ATTLIST file project CDATA #REQUIRED> +<!ATTLIST file module CDATA #REQUIRED> <!ATTLIST file path CDATA #REQUIRED> <!ELEMENT result EMPTY> <!ATTLIST result date CDATA #REQUIRED> <!ATTLIST result statvalue CDATA #REQUIRED> <!ATTLIST result type CDATA #REQUIRED> <!ELEMENT summaryresult EMPTY> +<!ATTLIST summaryresult project CDATA #REQUIRED> +<!ATTLIST summaryresult module CDATA #REQUIRED> <!ATTLIST summaryresult date CDATA #REQUIRED> <!ATTLIST summaryresult statvalue CDATA #REQUIRED> <!ATTLIST summaryresult filecount CDATA #REQUIRED> <!ATTLIST summaryresult type CDATA #REQUIRED> ]> -<qalab version="1.1"> +<qalab version="1.2"> <summary> - <summaryresult date="2006-10-05" filecount="31" statvalue="1696" type="checkstyle"/> - <summaryresult date="2006-10-05" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-05" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-05" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-06" filecount="18" statvalue="469" type="checkstyle"/> - <summaryresult date="2006-10-06" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-06" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-06" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-12" filecount="31" statvalue="1696" type="checkstyle"/> - <summaryresult date="2006-10-12" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-12" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-12" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-13" filecount="31" statvalue="1696" type="checkstyle"/> - <summaryresult date="2006-10-13" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-13" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-13" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-14" filecount="31" statvalue="1696" type="checkstyle"/> - <summaryresult date="2006-10-14" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-14" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-14" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-15" filecount="31" statvalue="1696" type="checkstyle"/> - <summaryresult date="2006-10-15" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-15" filecount="7" statvalue="20" type="findbugs"/> - <summaryresult date="2006-10-15" filecount="3" statvalue="170" type="simian"/> - <summaryresult date="2006-10-16" filecount="18" statvalue="32" type="checkstyle"/> - <summaryresult date="2006-10-16" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-16" filecount="7" statvalue="16" type="findbugs"/> - <summaryresult date="2006-10-16" filecount="3" statvalue="116" type="simian"/> - <summaryresult date="2006-10-16" filecount="13" statvalue="17" type="cobertura-line"/> - <summaryresult date="2006-10-16" filecount="13" statvalue="23" type="cobertura-branch"/> - <summaryresult date="2006-10-17" filecount="18" statvalue="25" type="checkstyle"/> - <summaryresult date="2006-10-17" filecount="3" statvalue="5" type="pmd"/> - <summaryresult date="2006-10-17" filecount="6" statvalue="11" type="findbugs"/> - <summaryresult date="2006-10-17" filecount="3" statvalue="116" type="simian"/> - <summaryresult date="2006-10-17" filecount="13" statvalue="17" type="cobertura-line"/> - <summaryresult date="2006-10-17" filecount="13" statvalue="23" type="cobertura-branch"/> - <summaryresult date="2006-10-18" filecount="19" statvalue="26" type="checkstyle"/> - <summaryresult date="2006-10-18" filecount="3" statvalue="5" type="pmd"/> - <summaryresult date="2006-10-18" filecount="6" statvalue="11" type="findbugs"/> - <summaryresult date="2006-10-18" filecount="3" statvalue="116" type="simian"/> - <summaryresult date="2006-10-18" filecount="14" statvalue="18" type="cobertura-line"/> - <summaryresult date="2006-10-18" filecount="14" statvalue="24" type="cobertura-branch"/> - <summaryresult date="2006-10-20" filecount="19" statvalue="26" type="checkstyle"/> - <summaryresult date="2006-10-20" filecount="3" statvalue="5" type="pmd"/> - <summaryresult date="2006-10-20" filecount="6" statvalue="11" type="findbugs"/> - <summaryresult date="2006-10-20" filecount="3" statvalue="116" type="simian"/> - <summaryresult date="2006-10-20" filecount="14" statvalue="18" type="cobertura-line"/> - <summaryresult date="2006-10-20" filecount="14" statvalue="24" type="cobertura-branch"/> - <summaryresult date="2006-10-25" filecount="19" statvalue="26" type="checkstyle"/> - <summaryresult date="2006-10-25" filecount="3" statvalue="6" type="pmd"/> - <summaryresult date="2006-10-25" filecount="6" statvalue="12" type="findbugs"/> - <summaryresult date="2006-10-25" filecount="3" statvalue="106" type="simian"/> - <summaryresult date="2006-10-25" filecount="14" statvalue="20" type="cobertura-line"/> - <summaryresult date="2006-10-25" filecount="14" statvalue="27" type="cobertura-branch"/> - <summaryresult date="2006-11-02" filecount="35" statvalue="51" type="checkstyle"/> - <summaryresult date="2006-11-02" filecount="4" statvalue="6" type="pmd"/> - <summaryresult date="2006-11-02" filecount="10" statvalue="15" type="findbugs"/> - <summaryresult date="2006-11-02" filecount="10" statvalue="439" type="simian"/> - <summaryresult date="2006-11-02" filecount="30" statvalue="23" type="cobertura-line"/> - <summaryresult date="2006-11-02" filecount="30" statvalue="30" type="cobertura-branch"/> + <summaryresult date="2006-10-05" filecount="31" module="default" + project="default" statvalue="1696" type="checkstyle"/> + <summaryresult date="2006-10-05" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-05" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-05" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-06" filecount="18" module="default" + project="default" statvalue="469" type="checkstyle"/> + <summaryresult date="2006-10-06" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-06" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-06" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-12" filecount="31" module="default" + project="default" statvalue="1696" type="checkstyle"/> + <summaryresult date="2006-10-12" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-12" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-12" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-13" filecount="31" module="default" + project="default" statvalue="1696" type="checkstyle"/> + <summaryresult date="2006-10-13" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-13" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-13" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-14" filecount="31" module="default" + project="default" statvalue="1696" type="checkstyle"/> + <summaryresult date="2006-10-14" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-14" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-14" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-15" filecount="31" module="default" + project="default" statvalue="1696" type="checkstyle"/> + <summaryresult date="2006-10-15" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-15" filecount="7" module="default" + project="default" statvalue="20" type="findbugs"/> + <summaryresult date="2006-10-15" filecount="3" module="default" + project="default" statvalue="170" type="simian"/> + <summaryresult date="2006-10-16" filecount="18" module="default" + project="default" statvalue="32" type="checkstyle"/> + <summaryresult date="2006-10-16" filecount="2" module="default" + project="default" statvalue="4" type="pmd"/> + <summaryresult date="2006-10-16" filecount="7" module="default" + project="default" statvalue="16" type="findbugs"/> + <summaryresult date="2006-10-16" filecount="3" module="default" + project="default" statvalue="116" type="simian"/> + <summaryresult date="2006-10-16" filecount="13" module="default" + project="default" statvalue="17" type="cobertura-line"/> + <summaryresult date="2006-10-16" filecount="13" module="default" + project="default" statvalue="23" type="cobertura-branch"/> + <summaryresult date="2006-10-17" filecount="18" module="default" + project="default" statvalue="25" type="checkstyle"/> + <summaryresult date="2006-10-17" filecount="3" module="default" + project="default" statvalue="5" type="pmd"/> + <summaryresult date="2006-10-17" filecount="6" module="default" + project="default" statvalue="11" type="findbugs"/> + <summaryresult date="2006-10-17" filecount="3" module="default" + project="default" statvalue="116" type="simian"/> + <summaryresult date="2006-10-17" filecount="13" module="default" + project="default" statvalue="17" type="cobertura-line"/> + <summaryresult date="2006-10-17" filecount="13" module="default" + project="default" statvalue="23" type="cobertura-branch"/> + <summaryresult date="2006-10-18" filecount="19" module="default" + project="default" statvalue="26" type="checkstyle"/> + <summaryresult date="2006-10-18" filecount="3" module="default" + project="default" statvalue="5" type="pmd"/> + <summaryresult date="2006-10-18" filecount="6" module="default" + project="default" statvalue="11" type="findbugs"/> + <summaryresult date="2006-10-18" filecount="3" module="default" + project="default" statvalue="116" type="simian"/> + <summaryresult date="2006-10-18" filecount="14" module="default" + project="default" statvalue="18" type="cobertura-line"/> + <summaryresult date="2006-10-18" filecount="14" module="default" + project="default" statvalue="24" type="cobertura-branch"/> + <summaryresult date="2006-10-20" filecount="19" module="default" + project="default" statvalue="26" type="checkstyle"/> + <summaryresult date="2006-10-20" filecount="3" module="default" + project="default" statvalue="5" type="pmd"/> + <summaryresult date="2006-10-20" filecount="6" module="default" + project="default" statvalue="11" type="findbugs"/> + <summaryresult date="2006-10-20" filecount="3" module="default" + project="default" statvalue="116" type="simian"/> + <summaryresult date="2006-10-20" filecount="14" module="default" + project="default" statvalue="18" type="cobertura-line"/> + <summaryresult date="2006-10-20" filecount="14" module="default" + project="default" statvalue="24" type="cobertura-branch"/> + <summaryresult date="2006-10-25" filecount="19" module="default" + project="default" statvalue="26" type="checkstyle"/> + <summaryresult date="2006-10-25" filecount="3" module="default" + project="default" statvalue="6" type="pmd"/> + <summaryresult date="2006-10-25" filecount="6" module="default" + project="default" statvalue="12" type="findbugs"/> + <summaryresult date="2006-10-25" filecount="3" module="default" + project="default" statvalue="106" type="simian"/> + <summaryresult date="2006-10-25" filecount="14" module="default" + project="default" statvalue="20" type="cobertura-line"/> + <summaryresult date="2006-10-25" filecount="14" module="default" + project="default" statvalue="27" type="cobertura-branch"/> + <summaryresult date="2006-11-02" filecount="35" module="default" + project="default" statvalue="51" type="checkstyle"/> + <summaryresult date="2006-11-02" filecount="4" module="default" + project="default" statvalue="6" type="pmd"/> + <summaryresult date="2006-11-02" filecount="10" module="default" + project="default" statvalue="15" type="findbugs"/> + <summaryresult date="2006-11-02" filecount="10" module="default" + project="default" statvalue="439" type="simian"/> + <summaryresult date="2006-11-02" filecount="30" module="default" + project="default" statvalue="23" type="cobertura-line"/> + <summaryresult date="2006-11-02" filecount="30" module="default" + project="default" statvalue="30" type="cobertura-branch"/> + <summaryresult date="2006-11-22" filecount="38" module="default" + project="default" statvalue="46" type="checkstyle"/> + <summaryresult date="2006-11-22" filecount="11" module="default" + project="default" statvalue="16" type="findbugs"/> + <summaryresult date="2006-11-22" filecount="10" module="default" + project="default" statvalue="377" type="simian"/> + <summaryresult date="2006-11-22" filecount="33" module="default" + project="default" statvalue="24" type="cobertura-line"/> + <summaryresult date="2006-11-22" filecount="33" module="default" + project="default" statvalue="30" type="cobertura-branch"/> + <summaryresult date="2006-11-22" filecount="4" module="default" + project="default" statvalue="6" type="pmd"/> + <summaryresult date="2006-12-15" filecount="41" module="default" + project="default" statvalue="41" type="checkstyle"/> + <summaryresult date="2006-12-15" filecount="9" module="default" + project="default" statvalue="13" type="findbugs"/> + <summaryresult date="2006-12-15" filecount="6" module="default" + project="default" statvalue="152" type="simian"/> + <summaryresult date="2006-12-15" filecount="34" module="default" + project="default" statvalue="27" type="cobertura-line"/> + <summaryresult date="2006-12-15" filecount="34" module="default" + project="default" statvalue="37" type="cobertura-branch"/> + <summaryresult date="2006-12-15" filecount="6" module="default" + project="default" statvalue="15" type="pmd"/> </summary> - <file id="com_pz_reader_ordering_package.html" path="com/pz/reader/ordering/package.html"> + <file id="default-default-com_pz_reader_ordering_package.html" + module="default" path="com/pz/reader/ordering/package.html" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-06" statvalue="1" type="checkstyle"/> <result date="2006-10-12" statvalue="1" type="checkstyle"/> @@ -87,7 +176,8 @@ <result date="2006-10-15" statvalue="1" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="checkstyle"/> </file> - <file id="com_pz_reader_package.html" path="com/pz/reader/package.html"> + <file id="default-default-com_pz_reader_package.html" + module="default" path="com/pz/reader/package.html" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-06" statvalue="1" type="checkstyle"/> <result date="2006-10-12" statvalue="1" type="checkstyle"/> @@ -96,7 +186,8 @@ <result date="2006-10-15" statvalue="1" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="checkstyle"/> </file> - <file id="com_pz_reader_util_package.html" path="com/pz/reader/util/package.html"> + <file id="default-default-com_pz_reader_util_package.html" + module="default" path="com/pz/reader/util/package.html" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-06" statvalue="1" type="checkstyle"/> <result date="2006-10-12" statvalue="1" type="checkstyle"/> @@ -105,7 +196,8 @@ <result date="2006-10-15" statvalue="1" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="checkstyle"/> </file> - <file id="com_pz_reader_xml_package.html" path="com/pz/reader/xml/package.html"> + <file id="default-default-com_pz_reader_xml_package.html" + module="default" path="com/pz/reader/xml/package.html" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-06" statvalue="1" type="checkstyle"/> <result date="2006-10-12" statvalue="1" type="checkstyle"/> @@ -114,7 +206,8 @@ <result date="2006-10-15" statvalue="1" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="checkstyle"/> </file> - <file id="com_pz_reader_structure_package.html" path="com/pz/reader/structure/package.html"> + <file id="default-default-com_pz_reader_structure_package.html" + module="default" path="com/pz/reader/structure/package.html" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-06" statvalue="1" type="checkstyle"/> <result date="2006-10-12" statvalue="1" type="checkstyle"/> @@ -123,7 +216,8 @@ <result date="2006-10-15" statvalue="1" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="checkstyle"/> </file> - <file id="com_pz_reader_structure_Row.java" path="com/pz/reader/structure/Row.java"> + <file id="default-default-com_pz_reader_structure_Row.java" + module="default" path="com/pz/reader/structure/Row.java" project="default"> <result date="2006-10-05" statvalue="1" type="checkstyle"/> <result date="2006-10-05" statvalue="33" type="checkstyle"/> <result date="2006-10-05" statvalue="1" type="findbugs"/> @@ -167,7 +261,8 @@ <result date="2006-10-16" statvalue="1" type="findbugs"/> <result date="2006-10-16" statvalue="44" type="cobertura-line"/> </file> - <file id="com_pz_reader_DataError.java" path="com/pz/reader/DataError.java"> + <file id="default-default-com_pz_reader_DataError.java" + module="default" path="com/pz/reader/DataError.java" project="default"> <result date="2006-10-05" statvalue="22" type="checkstyle"/> <result date="2006-10-06" statvalue="5" type="checkstyle"/> <result date="2006-10-12" statvalue="22" type="checkstyle"/> @@ -177,7 +272,8 @@ <result date="2006-10-16" statvalue="3" type="checkstyle"/> <result date="2006-10-16" statvalue="100" type="cobertura-branch"/> </file> - <file id="com_pz_reader_DataSet.java" path="com/pz/reader/DataSet.java"> + <file id="default-default-com_pz_reader_DataSet.java" + module="default" path="com/pz/reader/DataSet.java" project="default"> <result date="2006-10-05" statvalue="485" type="checkstyle"/> <result date="2006-10-05" statvalue="5" type="findbugs"/> <result date="2006-10-06" statvalue="103" type="checkstyle"/> @@ -195,7 +291,8 @@ <result date="2006-10-16" statvalue="20" type="cobertura-line"/> <result date="2006-10-16" statvalue="25" type="cobertura-branch"/> </file> - <file id="com_pz_reader_LargeDataSet.java" path="com/pz/reader/LargeDataSet.java"> + <file id="default-default-com_pz_reader_LargeDataSet.java" + module="default" path="com/pz/reader/LargeDataSet.java" project="default"> <result date="2006-10-05" statvalue="278" type="checkstyle"/> <result date="2006-10-05" statvalue="3" type="findbugs"/> <result date="2006-10-06" statvalue="63" type="checkstyle"/> @@ -211,7 +308,8 @@ <result date="2006-10-16" statvalue="5" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="findbugs"/> </file> - <file id="com_pz_reader_Version.java" path="com/pz/reader/Version.java"> + <file id="default-default-com_pz_reader_Version.java" + module="default" path="com/pz/reader/Version.java" project="default"> <result date="2006-10-05" statvalue="2" type="checkstyle"/> <result date="2006-10-12" statvalue="2" type="checkstyle"/> <result date="2006-10-13" statvalue="2" type="checkstyle"/> @@ -219,7 +317,8 @@ <result date="2006-10-15" statvalue="2" type="checkstyle"/> <result date="2006-10-16" statvalue="100" type="cobertura-branch"/> </file> - <file id="com_pz_reader_ordering_OrderBy.java" path="com/pz/reader/ordering/OrderBy.java"> + <file id="default-default-com_pz_reader_ordering_OrderBy.java" + module="default" path="com/pz/reader/ordering/OrderBy.java" project="default"> <result date="2006-10-05" statvalue="65" type="checkstyle"/> <result date="2006-10-05" statvalue="5" type="findbugs"/> <result date="2006-10-06" statvalue="12" type="checkstyle"/> @@ -234,7 +333,8 @@ <result date="2006-10-15" statvalue="5" type="findbugs"/> <result date="2006-10-16" statvalue="5" type="findbugs"/> </file> - <file id="com_pz_reader_ordering_OrderColumn.java" path="com/pz/reader/ordering/OrderColumn.java"> + <file id="default-default-com_pz_reader_ordering_OrderColumn.java" + module="default" path="com/pz/reader/ordering/OrderColumn.java" project="default"> <result date="2006-10-05" statvalue="25" type="checkstyle"/> <result date="2006-10-06" statvalue="4" type="checkstyle"/> <result date="2006-10-12" statvalue="25" type="checkstyle"/> @@ -242,7 +342,10 @@ <result date="2006-10-14" statvalue="25" type="checkstyle"/> <result date="2006-10-15" statvalue="25" type="checkstyle"/> </file> - <file id="com_pz_reader_structure_ColumnMetaData.java" path="com/pz/reader/structure/ColumnMetaData.java"> + <file + id="default-default-com_pz_reader_structure_ColumnMetaData.java" + module="default" + path="com/pz/reader/structure/ColumnMetaData.java" project="default"> <result date="2006-10-05" statvalue="99" type="checkstyle"/> <result date="2006-10-06" statvalue="66" type="checkstyle"/> <result date="2006-10-12" statvalue="99" type="checkstyle"/> @@ -252,8 +355,10 @@ <result date="2006-10-16" statvalue="50" type="cobertura-line"/> <result date="2006-10-16" statvalue="100" type="cobertura-branch"/> </file> - <file id="com_pz_reader_structure_Row.java" path="com/pz/reader/structure/Row.java"/> - <file id="com_pz_reader_util_ExcelTransformer.java" path="com/pz/reader/util/ExcelTransformer.java"> + <file id="default-default-com_pz_reader_structure_Row.java" + module="default" path="com/pz/reader/structure/Row.java" project="default"/> + <file id="default-default-com_pz_reader_util_ExcelTransformer.java" + module="default" path="com/pz/reader/util/ExcelTransformer.java" project="default"> <result date="2006-10-05" statvalue="60" type="checkstyle"/> <result date="2006-10-06" statvalue="8" type="checkstyle"/> <result date="2006-10-12" statvalue="60" type="checkstyle"/> @@ -261,7 +366,8 @@ <result date="2006-10-14" statvalue="60" type="checkstyle"/> <result date="2006-10-15" statvalue="60" type="checkstyle"/> </file> - <file id="com_pz_reader_util_ParserUtils.java" path="com/pz/reader/util/ParserUtils.java"> + <file id="default-default-com_pz_reader_util_ParserUtils.java" + module="default" path="com/pz/reader/util/ParserUtils.java" project="default"> <result date="2006-10-05" statvalue="290" type="checkstyle"/> <result date="2006-10-05" statvalue="3" type="pmd"/> <result date="2006-10-05" statvalue="3" type="findbugs"/> @@ -286,7 +392,8 @@ <result date="2006-10-16" statvalue="35" type="cobertura-line"/> <result date="2006-10-16" statvalue="42" type="cobertura-branch"/> </file> - <file id="com_pz_reader_xml_PZMapParser.java" path="com/pz/reader/xml/PZMapParser.java"> + <file id="default-default-com_pz_reader_xml_PZMapParser.java" + module="default" path="com/pz/reader/xml/PZMapParser.java" project="default"> <result date="2006-10-05" statvalue="257" type="checkstyle"/> <result date="2006-10-05" statvalue="1" type="pmd"/> <result date="2006-10-05" statvalue="1" type="findbugs"/> @@ -309,7 +416,8 @@ <result date="2006-10-16" statvalue="1" type="pmd"/> <result date="2006-10-16" statvalue="1" type="findbugs"/> </file> - <file id="com_pz_reader_xml_ResolveLocalDTD.java" path="com/pz/reader/xml/ResolveLocalDTD.java"> + <file id="default-default-com_pz_reader_xml_ResolveLocalDTD.java" + module="default" path="com/pz/reader/xml/ResolveLocalDTD.java" project="default"> <result date="2006-10-05" statvalue="40" type="checkstyle"/> <result date="2006-10-05" statvalue="2" type="findbugs"/> <result date="2006-10-06" statvalue="16" type="checkstyle"/> @@ -324,7 +432,8 @@ <result date="2006-10-15" statvalue="2" type="findbugs"/> <result date="2006-10-16" statvalue="2" type="findbugs"/> </file> - <file id="com_pz_reader_xml_XMLRecordElement.java" path="com/pz/reader/xml/XMLRecordElement.java"> + <file id="default-default-com_pz_reader_xml_XMLRecordElement.java" + module="default" path="com/pz/reader/xml/XMLRecordElement.java" project="default"> <result date="2006-10-05" statvalue="34" type="checkstyle"/> <result date="2006-10-06" statvalue="2" type="checkstyle"/> <result date="2006-10-12" statvalue="34" type="checkstyle"/> @@ -334,23 +443,34 @@ <result date="2006-10-16" statvalue="100" type="cobertura-branch"/> </file> <file - id="C:_project_pzfilereader_PZFileReader_src_test_java_com_test_delim_multiLine_TestCSVPerformance.java" path="C:/project/pzfilereader/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java"/> - <file id="net_sf_pzfilereader_util_package.html" path="net/sf/pzfilereader/util/package.html"> + id="default-default-C:_project_pzfilereader_PZFileReader_src_test_java_com_test_delim_multiLine_TestCSVPerformance.java" + module="default" + path="C:/project/pzfilereader/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java" project="default"/> + <file id="default-default-net_sf_pzfilereader_util_package.html" + module="default" path="net/sf/pzfilereader/util/package.html" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_package.html" path="net/sf/pzfilereader/package.html"> + <file id="default-default-net_sf_pzfilereader_package.html" + module="default" path="net/sf/pzfilereader/package.html" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_ordering_package.html" path="net/sf/pzfilereader/ordering/package.html"> + <file id="default-default-net_sf_pzfilereader_ordering_package.html" + module="default" + path="net/sf/pzfilereader/ordering/package.html" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_xml_package.html" path="net/sf/pzfilereader/xml/package.html"> + <file id="default-default-net_sf_pzfilereader_xml_package.html" + module="default" path="net/sf/pzfilereader/xml/package.html" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_structure_package.html" path="net/sf/pzfilereader/structure/package.html"> + <file + id="default-default-net_sf_pzfilereader_structure_package.html" + module="default" + path="net/sf/pzfilereader/structure/package.html" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_DataError.java" path="net/sf/pzfilereader/DataError.java"> + <file id="default-default-net_sf_pzfilereader_DataError.java" + module="default" path="net/sf/pzfilereader/DataError.java" project="default"> <result date="2006-10-17" statvalue="3" type="checkstyle"/> <result date="2006-10-17" statvalue="100" type="cobertura-branch"/> <result date="2006-10-18" statvalue="3" type="checkstyle"/> @@ -361,8 +481,13 @@ <result date="2006-10-25" statvalue="100" type="cobertura-branch"/> <result date="2006-11-02" statvalue="3" type="checkstyle"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="3" type="checkstyle"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="3" type="checkstyle"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_DataSet.java" path="net/sf/pzfilereader/DataSet.java"> + <file id="default-default-net_sf_pzfilereader_DataSet.java" + module="default" path="net/sf/pzfilereader/DataSet.java" project="default"> <result date="2006-10-17" statvalue="4" type="checkstyle"/> <result date="2006-10-17" statvalue="1" type="pmd"/> <result date="2006-10-17" statvalue="2" type="findbugs"/> @@ -387,15 +512,25 @@ <result date="2006-11-02" statvalue="2" type="findbugs"/> <result date="2006-11-02" statvalue="13" type="cobertura-line"/> <result date="2006-11-02" statvalue="17" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="3" type="checkstyle"/> + <result date="2006-11-22" statvalue="2" type="findbugs"/> + <result date="2006-11-22" statvalue="11" type="cobertura-line"/> + <result date="2006-11-22" statvalue="13" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_LargeDataSet.java" path="net/sf/pzfilereader/LargeDataSet.java"> + <file id="default-default-net_sf_pzfilereader_LargeDataSet.java" + module="default" path="net/sf/pzfilereader/LargeDataSet.java" project="default"> <result date="2006-10-17" statvalue="4" type="checkstyle"/> <result date="2006-10-18" statvalue="4" type="checkstyle"/> <result date="2006-10-20" statvalue="4" type="checkstyle"/> <result date="2006-10-25" statvalue="4" type="checkstyle"/> <result date="2006-11-02" statvalue="3" type="checkstyle"/> + <result date="2006-11-22" statvalue="3" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_ordering_OrderBy.java" path="net/sf/pzfilereader/ordering/OrderBy.java"> + <file id="default-default-net_sf_pzfilereader_ordering_OrderBy.java" + module="default" + path="net/sf/pzfilereader/ordering/OrderBy.java" project="default"> <result date="2006-10-17" statvalue="1" type="checkstyle"/> <result date="2006-10-17" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="1" type="checkstyle"/> @@ -406,8 +541,14 @@ <result date="2006-10-25" statvalue="2" type="findbugs"/> <result date="2006-11-02" statvalue="1" type="checkstyle"/> <result date="2006-11-02" statvalue="2" type="findbugs"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="2" type="findbugs"/> + <result date="2006-12-15" statvalue="1" type="checkstyle"/> + <result date="2006-12-15" statvalue="2" type="findbugs"/> </file> - <file id="net_sf_pzfilereader_util_ParserUtils.java" path="net/sf/pzfilereader/util/ParserUtils.java"> + <file id="default-default-net_sf_pzfilereader_util_ParserUtils.java" + module="default" + path="net/sf/pzfilereader/util/ParserUtils.java" project="default"> <result date="2006-10-17" statvalue="4" type="checkstyle"/> <result date="2006-10-17" statvalue="3" type="pmd"/> <result date="2006-10-17" statvalue="3" type="findbugs"/> @@ -433,8 +574,19 @@ <result date="2006-11-02" statvalue="3" type="findbugs"/> <result date="2006-11-02" statvalue="47" type="cobertura-line"/> <result date="2006-11-02" statvalue="57" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="10" type="checkstyle"/> + <result date="2006-11-22" statvalue="3" type="findbugs"/> + <result date="2006-11-22" statvalue="49" type="cobertura-line"/> + <result date="2006-11-22" statvalue="58" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="3" type="pmd"/> + <result date="2006-12-15" statvalue="11" type="checkstyle"/> + <result date="2006-12-15" statvalue="3" type="findbugs"/> + <result date="2006-12-15" statvalue="51" type="cobertura-line"/> + <result date="2006-12-15" statvalue="60" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="2" type="pmd"/> </file> - <file id="net_sf_pzfilereader_xml_PZMapParser.java" path="net/sf/pzfilereader/xml/PZMapParser.java"> + <file id="default-default-net_sf_pzfilereader_xml_PZMapParser.java" + module="default" path="net/sf/pzfilereader/xml/PZMapParser.java" project="default"> <result date="2006-10-17" statvalue="4" type="checkstyle"/> <result date="2006-10-17" statvalue="1" type="pmd"/> <result date="2006-10-17" statvalue="1" type="findbugs"/> @@ -450,15 +602,26 @@ <result date="2006-11-02" statvalue="4" type="checkstyle"/> <result date="2006-11-02" statvalue="1" type="pmd"/> <result date="2006-11-02" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="4" type="checkstyle"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="1" type="pmd"/> + <result date="2006-12-15" statvalue="3" type="checkstyle"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> </file> - <file id="net_sf_pzfilereader_xml_ResolveLocalDTD.java" path="net/sf/pzfilereader/xml/ResolveLocalDTD.java"> + <file + id="default-default-net_sf_pzfilereader_xml_ResolveLocalDTD.java" + module="default" + path="net/sf/pzfilereader/xml/ResolveLocalDTD.java" project="default"> <result date="2006-10-17" statvalue="2" type="findbugs"/> <result date="2006-10-18" statvalue="2" type="findbugs"/> <result date="2006-10-20" statvalue="2" type="findbugs"/> <result date="2006-10-25" statvalue="2" type="findbugs"/> <result date="2006-11-02" statvalue="2" type="findbugs"/> + <result date="2006-11-22" statvalue="2" type="findbugs"/> + <result date="2006-12-15" statvalue="2" type="findbugs"/> </file> - <file id="net_sf_pzfilereader_structure_Row.java" path="net/sf/pzfilereader/structure/Row.java"> + <file id="default-default-net_sf_pzfilereader_structure_Row.java" + module="default" path="net/sf/pzfilereader/structure/Row.java" project="default"> <result date="2006-10-17" statvalue="1" type="findbugs"/> <result date="2006-10-17" statvalue="44" type="cobertura-line"/> <result date="2006-10-18" statvalue="1" type="findbugs"/> @@ -469,8 +632,15 @@ <result date="2006-10-25" statvalue="44" type="cobertura-line"/> <result date="2006-11-02" statvalue="1" type="findbugs"/> <result date="2006-11-02" statvalue="43" type="cobertura-line"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="43" type="cobertura-line"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> + <result date="2006-12-15" statvalue="36" type="cobertura-line"/> </file> - <file id="net_sf_pzfilereader_structure_ColumnMetaData.java" path="net/sf/pzfilereader/structure/ColumnMetaData.java"> + <file + id="default-default-net_sf_pzfilereader_structure_ColumnMetaData.java" + module="default" + path="net/sf/pzfilereader/structure/ColumnMetaData.java" project="default"> <result date="2006-10-17" statvalue="50" type="cobertura-line"/> <result date="2006-10-17" statvalue="100" type="cobertura-branch"/> <result date="2006-10-18" statvalue="50" type="cobertura-line"/> @@ -481,90 +651,279 @@ <result date="2006-10-25" statvalue="100" type="cobertura-branch"/> <result date="2006-11-02" statvalue="66" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="66" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="66" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_Version.java" path="net/sf/pzfilereader/Version.java"> + <file id="default-default-net_sf_pzfilereader_Version.java" + module="default" path="net/sf/pzfilereader/Version.java" project="default"> <result date="2006-10-17" statvalue="100" type="cobertura-branch"/> <result date="2006-10-18" statvalue="100" type="cobertura-branch"/> <result date="2006-10-20" statvalue="100" type="cobertura-branch"/> <result date="2006-10-25" statvalue="100" type="cobertura-branch"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_xml_XMLRecordElement.java" path="net/sf/pzfilereader/xml/XMLRecordElement.java"> + <file + id="default-default-net_sf_pzfilereader_xml_XMLRecordElement.java" + module="default" + path="net/sf/pzfilereader/xml/XMLRecordElement.java" project="default"> <result date="2006-10-17" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_util_PZConstants.java" path="net/sf/pzfilereader/util/PZConstants.java"> + <file id="default-default-net_sf_pzfilereader_util_PZConstants.java" + module="default" + path="net/sf/pzfilereader/util/PZConstants.java" project="default"> <result date="2006-10-18" statvalue="100" type="cobertura-branch"/> <result date="2006-10-20" statvalue="100" type="cobertura-branch"/> <result date="2006-10-25" statvalue="100" type="cobertura-branch"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_AbstractDelimiterPZParser.java" path="net/sf/pzfilereader/AbstractDelimiterPZParser.java"> + <file + id="default-default-net_sf_pzfilereader_AbstractDelimiterPZParser.java" + module="default" + path="net/sf/pzfilereader/AbstractDelimiterPZParser.java" project="default"> <result date="2006-11-02" statvalue="7" type="checkstyle"/> <result date="2006-11-02" statvalue="49" type="cobertura-line"/> <result date="2006-11-02" statvalue="57" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="7" type="checkstyle"/> + <result date="2006-11-22" statvalue="53" type="cobertura-line"/> + <result date="2006-11-22" statvalue="59" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="11" type="checkstyle"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> + <result date="2006-12-15" statvalue="52" type="cobertura-line"/> + <result date="2006-12-15" statvalue="60" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="2" type="pmd"/> </file> - <file id="net_sf_pzfilereader_DelimiterPZParser.java" path="net/sf/pzfilereader/DelimiterPZParser.java"> + <file + id="default-default-net_sf_pzfilereader_DelimiterPZParser.java" + module="default" + path="net/sf/pzfilereader/DelimiterPZParser.java" project="default"> <result date="2006-11-02" statvalue="1" type="checkstyle"/> <result date="2006-11-02" statvalue="32" type="cobertura-line"/> <result date="2006-11-02" statvalue="75" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="32" type="cobertura-line"/> + <result date="2006-11-22" statvalue="75" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="1" type="checkstyle"/> + <result date="2006-12-15" statvalue="37" type="cobertura-line"/> + <result date="2006-12-15" statvalue="75" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_FixedLengthPZParser.java" path="net/sf/pzfilereader/FixedLengthPZParser.java"> + <file + id="default-default-net_sf_pzfilereader_FixedLengthPZParser.java" + module="default" + path="net/sf/pzfilereader/FixedLengthPZParser.java" project="default"> <result date="2006-11-02" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-12-15" statvalue="1" type="checkstyle"/> </file> - <file id="net_sf_pzfilereader_IDataSet.java" path="net/sf/pzfilereader/IDataSet.java"> + <file id="default-default-net_sf_pzfilereader_IDataSet.java" + module="default" path="net/sf/pzfilereader/IDataSet.java" project="default"> <result date="2006-11-02" statvalue="1" type="checkstyle"/> <result date="2006-11-02" statvalue="1" type="pmd"/> <result date="2006-11-02" statvalue="100" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="100" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="pmd"/> </file> - <file id="net_sf_pzfilereader_util_BXParser.java" path="net/sf/pzfilereader/util/BXParser.java"> + <file id="default-default-net_sf_pzfilereader_util_BXParser.java" + module="default" path="net/sf/pzfilereader/util/BXParser.java" project="default"> <result date="2006-11-02" statvalue="9" type="checkstyle"/> <result date="2006-11-02" statvalue="47" type="cobertura-line"/> <result date="2006-11-02" statvalue="53" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="9" type="checkstyle"/> + <result date="2006-11-22" statvalue="55" type="cobertura-line"/> + <result date="2006-11-22" statvalue="65" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_util_ExcelTransformer.java" path="net/sf/pzfilereader/util/ExcelTransformer.java"> + <file + id="default-default-net_sf_pzfilereader_util_ExcelTransformer.java" + module="default" + path="net/sf/pzfilereader/util/ExcelTransformer.java" project="default"> <result date="2006-11-02" statvalue="1" type="checkstyle"/> <result date="2006-11-02" statvalue="1" type="pmd"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="1" type="pmd"/> </file> - <file id="net_sf_pzfilereader_util_FixedWidthParserUtils.java" path="net/sf/pzfilereader/util/FixedWidthParserUtils.java"> + <file + id="default-default-net_sf_pzfilereader_util_FixedWidthParserUtils.java" + module="default" + path="net/sf/pzfilereader/util/FixedWidthParserUtils.java" project="default"> <result date="2006-11-02" statvalue="1" type="checkstyle"/> <result date="2006-11-02" statvalue="1" type="findbugs"/> <result date="2006-11-02" statvalue="32" type="cobertura-line"/> <result date="2006-11-02" statvalue="16" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="32" type="cobertura-line"/> + <result date="2006-11-22" statvalue="16" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> + <result date="2006-12-15" statvalue="30" type="cobertura-line"/> + <result date="2006-12-15" statvalue="16" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_util_RegExParser.java" path="net/sf/pzfilereader/util/RegExParser.java"> + <file id="default-default-net_sf_pzfilereader_util_RegExParser.java" + module="default" + path="net/sf/pzfilereader/util/RegExParser.java" project="default"> <result date="2006-11-02" statvalue="6" type="checkstyle"/> <result date="2006-11-02" statvalue="1" type="findbugs"/> <result date="2006-11-02" statvalue="92" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="92" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_DBDelimiterPZParser.java" path="net/sf/pzfilereader/DBDelimiterPZParser.java"> + <file + id="default-default-net_sf_pzfilereader_DBDelimiterPZParser.java" + module="default" + path="net/sf/pzfilereader/DBDelimiterPZParser.java" project="default"> <result date="2006-11-02" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> </file> - <file id="net_sf_pzfilereader_DBFixedLengthPZParser.java" path="net/sf/pzfilereader/DBFixedLengthPZParser.java"> + <file + id="default-default-net_sf_pzfilereader_DBFixedLengthPZParser.java" + module="default" + path="net/sf/pzfilereader/DBFixedLengthPZParser.java" project="default"> <result date="2006-11-02" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-12-15" statvalue="1" type="findbugs"/> </file> - <file id="net_sf_pzfilereader_AbstractPZParser.java" path="net/sf/pzfilereader/AbstractPZParser.java"> + <file id="default-default-net_sf_pzfilereader_AbstractPZParser.java" + module="default" + path="net/sf/pzfilereader/AbstractPZParser.java" project="default"> <result date="2006-11-02" statvalue="43" type="cobertura-line"/> <result date="2006-11-02" statvalue="50" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="43" type="cobertura-line"/> + <result date="2006-11-22" statvalue="50" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="43" type="cobertura-line"/> + <result date="2006-12-15" statvalue="50" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_DefaultDataSet.java" path="net/sf/pzfilereader/DefaultDataSet.java"> + <file id="default-default-net_sf_pzfilereader_DefaultDataSet.java" + module="default" path="net/sf/pzfilereader/DefaultDataSet.java" project="default"> <result date="2006-11-02" statvalue="19" type="cobertura-line"/> <result date="2006-11-02" statvalue="8" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="1" type="findbugs"/> + <result date="2006-11-22" statvalue="20" type="cobertura-line"/> + <result date="2006-11-22" statvalue="9" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="2" type="checkstyle"/> + <result date="2006-12-15" statvalue="22" type="cobertura-line"/> + <result date="2006-12-15" statvalue="12" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="2" type="pmd"/> </file> - <file id="net_sf_pzfilereader_DefaultPZParserFactory.java" path="net/sf/pzfilereader/DefaultPZParserFactory.java"> + <file + id="default-default-net_sf_pzfilereader_DefaultPZParserFactory.java" + module="default" + path="net/sf/pzfilereader/DefaultPZParserFactory.java" project="default"> <result date="2006-11-02" statvalue="33" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="33" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="33" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_PZParser.java" path="net/sf/pzfilereader/PZParser.java"> + <file id="default-default-net_sf_pzfilereader_PZParser.java" + module="default" path="net/sf/pzfilereader/PZParser.java" project="default"> <result date="2006-11-02" statvalue="100" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="100" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_PZParserFactory.java" path="net/sf/pzfilereader/PZParserFactory.java"> + <file id="default-default-net_sf_pzfilereader_PZParserFactory.java" + module="default" path="net/sf/pzfilereader/PZParserFactory.java" project="default"> <result date="2006-11-02" statvalue="100" type="cobertura-line"/> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="100" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> - <file id="net_sf_pzfilereader_InitialisationException.java" path="net/sf/pzfilereader/InitialisationException.java"> + <file + id="default-default-net_sf_pzfilereader_InitialisationException.java" + module="default" + path="net/sf/pzfilereader/InitialisationException.java" project="default"> <result date="2006-11-02" statvalue="100" type="cobertura-branch"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> </file> + <file + id="default-default-net_sf_pzfilereader_converter_package.html" + module="default" + path="net/sf/pzfilereader/converter/package.html" project="default"> + <result date="2006-11-22" statvalue="1" type="checkstyle"/> + </file> + <file + id="default-default-net_sf_pzfilereader_converter_PZConverter.java" + module="default" + path="net/sf/pzfilereader/converter/PZConverter.java" project="default"> + <result date="2006-11-22" statvalue="100" type="cobertura-line"/> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> + <file + id="default-default-net_sf_pzfilereader_converter_ConvertBigDecimal.java" + module="default" + path="net/sf/pzfilereader/converter/ConvertBigDecimal.java" project="default"> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> + <file + id="default-default-net_sf_pzfilereader_converter_PZConvertException.java" + module="default" + path="net/sf/pzfilereader/converter/PZConvertException.java" project="default"> + <result date="2006-11-22" statvalue="100" type="cobertura-branch"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> + <file id="default-default-net_sf_pzfilereader_brparse_package.html" + module="default" path="net/sf/pzfilereader/brparse/package.html" project="default"> + <result date="2006-12-15" statvalue="1" type="checkstyle"/> + </file> + <file + id="default-default-net_sf_pzfilereader_AbstractFixedLengthPZParser.java" + module="default" + path="net/sf/pzfilereader/AbstractFixedLengthPZParser.java" project="default"> + <result date="2006-12-15" statvalue="2" type="checkstyle"/> + <result date="2006-12-15" statvalue="2" type="pmd"/> + </file> + <file + id="default-default-net_sf_pzfilereader_brparse_BuffReaderDelimPZDataSet.java" + module="default" + path="net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java" project="default"> + <result date="2006-12-15" statvalue="2" type="checkstyle"/> + <result date="2006-12-15" statvalue="1" type="pmd"/> + </file> + <file + id="default-default-net_sf_pzfilereader_brparse_BuffReaderDelimPZParser.java" + module="default" + path="net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java" project="default"> + <result date="2006-12-15" statvalue="3" type="checkstyle"/> + <result date="2006-12-15" statvalue="6" type="pmd"/> + </file> + <file + id="default-default-net_sf_pzfilereader_converter_ConvertDouble.java" + module="default" + path="net/sf/pzfilereader/converter/ConvertDouble.java" project="default"> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> + <file + id="default-default-net_sf_pzfilereader_converter_ConvertInteger.java" + module="default" + path="net/sf/pzfilereader/converter/ConvertInteger.java" project="default"> + <result date="2006-12-15" statvalue="100" type="cobertura-line"/> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> + <file + id="default-default-net_sf_pzfilereader_brparse_BuffReaderPZParseFactory.java" + module="default" + path="net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java" project="default"> + <result date="2006-12-15" statvalue="100" type="cobertura-branch"/> + </file> </qalab> Added: trunk/PZFileReader/src/site/style/maven-objectlabkit.css =================================================================== --- trunk/PZFileReader/src/site/style/maven-objectlabkit.css (rev 0) +++ trunk/PZFileReader/src/site/style/maven-objectlabkit.css 2006-12-16 11:46:00 UTC (rev 229) @@ -0,0 +1,146 @@ +body, select, input, li { + background: #ffffff; + color: #002070; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +a img { + border: 0; +} + +a:link, a:visited { + color: #0020d0; + text-decoration: underline; +} + +a:hover { + color: #0000ff !important; +} + +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 15px; +} + +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} + +h2 { + padding: 2px 5px; + border: 1px solid #c0c0c0; + color: #002070; + background-color: #eeeeee; + font-weight: bold; + font-size: 16px; +} + +h3 { + padding: 2px 5px; + border: 1px solid #aaaaaa; + color: #002070; + background-color: #eeeeee; + font-size: 14px; +} + +p { + line-height: 1.3em; + font-size: small; +} + +#breadcrumbs { + background: url(../images/grayBar.jpg); + border: 1px solid #c0c0c0; + height: 17px; +} + +#breadcrumbs a { + font-size: 11px; + font-weight: bold; + margin: 0px 2px; + text-decoration: none; +} + +#leftColumn { + border: 1px solid #999999; + border-top: 0; + border-left: 0; + background: #eeeeee; +} + +div#navcolumn { + font-size: 12px; +} + +div#navcolumn h5 { + font-size: 12px; + padding-top: 2px; +} +/* +div#navcolumn li { + background: #eeeeee !important; +} +*/ +div#navcolumn div a { + color: #002070; + font-size: 11px; + text-decoration: none; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th { + color: #ffffff; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable a { + text-decoration : none; +} + +table.bodyTable tr.a { + background-c... [truncated message content] |
Revision: 228 http://svn.sourceforge.net/pzfilereader/?rev=228&view=rev Author: zepernick Date: 2006-12-15 15:15:22 -0800 (Fri, 15 Dec 2006) Log Message: ----------- changed over to new bufferedreader parser Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 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 23:11:51 UTC (rev 227) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 2006-12-15 23:15:22 UTC (rev 228) @@ -6,9 +6,12 @@ */ import java.io.File; -import java.io.FileInputStream; +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.brparse.BuffReaderFixedPZParser; +import net.sf.pzfilereader.brparse.BuffReaderPZParseFactory; + /** * @author zepernick * @@ -31,24 +34,26 @@ } public static void call(String mapping, String data) throws Exception { - 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); - - 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])); + BuffReaderFixedPZParser pzparse = null; + try { + pzparse = (BuffReaderFixedPZParser)BuffReaderPZParseFactory.getInstance().newFixedLengthParser(new File(mapping), + new File(data)); + + 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("==========================================================================="); + + } finally { + pzparse.close(); } - // 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-12-15 23:11:51
|
Revision: 227 http://svn.sourceforge.net/pzfilereader/?rev=227&view=rev Author: zepernick Date: 2006-12-15 15:11:51 -0800 (Fri, 15 Dec 2006) Log Message: ----------- added a bufferedreader parser for fixed width files. renamed the DataSet class and used it for both parsers Added Paths: ----------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/package.html Added: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/package.html =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/package.html (rev 0) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/package.html 2006-12-15 23:11:51 UTC (rev 227) @@ -0,0 +1,25 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> + <head> + <title>net.sf.pzfilereader.brparse package</title> + <!-- + Copyright 2006 Paul Zepernick + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the License. + + --> + </head> + <body bgcolor="white"> + Contains parsers which leave an open BufferedReader for file access. The parser + refrain from doing a "pre parse" and reading the file into memmory. + </body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 23:11:22
|
Revision: 226 http://svn.sourceforge.net/pzfilereader/?rev=226&view=rev Author: zepernick Date: 2006-12-15 15:11:21 -0800 (Fri, 15 Dec 2006) Log Message: ----------- added a bufferedreader parser for fixed width files. renamed the DataSet class and used it for both parsers Added Paths: ----------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java Added: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java (rev 0) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-15 23:11:21 UTC (rev 226) @@ -0,0 +1,170 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package net.sf.pzfilereader.brparse; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; +import java.util.Map; + +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.DefaultDataSet; +import net.sf.pzfilereader.FixedLengthPZParser; +import net.sf.pzfilereader.structure.Row; +import net.sf.pzfilereader.util.FixedWidthParserUtils; +import net.sf.pzfilereader.util.PZConstants; +import net.sf.pzfilereader.util.ParserUtils; + +public class BuffReaderFixedPZParser extends FixedLengthPZParser{ + private BufferedReader br; + + private InputStreamReader isr; + + private int lineCount = 0; + + private Map recordLengths; + + public BuffReaderFixedPZParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) { + super(pzmapXMLStream, dataSourceStream); + } + + public BuffReaderFixedPZParser(final File pzmapXML, final File dataSource) { + super(pzmapXML, dataSource); + } + + + public DataSet doParse() { + final DataSet ds = new BuffReaderPZDataSet(getColumnMD(), this); + lineCount = 0; + recordLengths = ParserUtils.calculateRecordLengths(getColumnMD()); + try { + //gather the conversion properties + ds.setPZConvertProps(ParserUtils.loadConvertProperties()); + + if (getDataSourceStream() == null) { + setDataSourceStream(ParserUtils.createInputStream(getDataSource())); + } + + isr = new InputStreamReader(getDataSourceStream()); + br = new BufferedReader(isr); + + return ds; + + } catch(IOException ex) { + ex.printStackTrace(); + } + + return null; + } + + + /** + * Reads in the next record on the file and return a row + * + * @param ds + * @return Row + * @throws IOException + */ + public Row buildRow(final DefaultDataSet ds) throws IOException{ + String line = null; + + while ((line = br.readLine()) != null) { + lineCount++; + // empty line skip past it + if (line.trim().length() == 0) { + continue; + } + + final String mdkey = FixedWidthParserUtils.getCMDKey(getColumnMD(), line); + final int recordLength = ((Integer) recordLengths.get(mdkey)).intValue(); + + // Incorrect record length on line log the error. Line will not + // be included in the + // dataset + if (line.length() > recordLength) { + addError(ds, "LINE TOO LONG. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2); + continue; + } else if (line.length() < recordLength) { + if (isHandlingShortLines()) { + // We can pad this line out + line += ParserUtils.padding(recordLength - line.length(), ' '); + + // log a warning + addError(ds, "PADDED LINE TO CORRECT RECORD LENGTH", lineCount, 1); + + } else { + addError(ds, "LINE TOO SHORT. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, + 2); + continue; + } + } + + final Row row = new Row(); + row.setMdkey(mdkey.equals(PZConstants.DETAIL_ID) ? null : mdkey); + + final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD()); + row.addColumn(FixedWidthParserUtils.splitFixedText(cmds, line)); + + row.setRowNumber(lineCount); + + return row; + } + + return null; + } + + /** + * Closes out the file readers + * + *@throws IOException + */ + public void close() throws IOException{ + if (br != null) { + br.close(); + } + if (isr != null) { + isr.close(); + } + } + + + /** + * Returns the meta data describing the columns + */ + public Map getColumnMD() { + return super.getColumnMD(); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 23:10:12
|
Revision: 225 http://svn.sourceforge.net/pzfilereader/?rev=225&view=rev Author: zepernick Date: 2006-12-15 15:10:09 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-15 23:09:46 UTC (rev 224) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-15 23:10:09 UTC (rev 225) @@ -1,3 +1,35 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ package net.sf.pzfilereader.brparse; import java.io.BufferedReader; @@ -44,7 +76,7 @@ public DataSet doParse() { - final DataSet ds = new BuffReaderDelimPZDataSet(getColumnMD(), this); + final DataSet ds = new BuffReaderPZDataSet(getColumnMD(), this); try { //gather the conversion properties ds.setPZConvertProps(ParserUtils.loadConvertProperties()); Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java 2006-12-15 23:09:46 UTC (rev 224) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java 2006-12-15 23:10:09 UTC (rev 225) @@ -1,3 +1,35 @@ +/* + * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader. + * + * Based in London, we are world leaders in the design and development + * of bespoke applications for the securities financing markets. + * + * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a> + * ___ _ _ _ _ _ + * / _ \| |__ (_) ___ ___| |_| | __ _| |__ + * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \ + * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) | + * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ + * |__/ + * + * www.ObjectLab.co.uk + * + * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ package net.sf.pzfilereader.brparse; import java.io.File; @@ -12,6 +44,12 @@ * a BufferedReader as an alternative to reading the * entire file into memory. * + * Database column mappings are not supported by this factory + * at the present time. This class is meant to mimic the LargeDataSet + * class of pre 3.0 versions, which did not support database mappings + * either. A RuntimeExcpetion will be thrown if trying to obtain a parser + * for a database map. + * * @author Paul Zepernick */ public class BuffReaderPZParseFactory implements PZParserFactory{ @@ -21,26 +59,18 @@ return INSTANCE; } - /* - * (non-Javadoc) - * - * @see net.sf.pzfilereader.PZParserFactory#newFixedWidthParser(java.sql.Connection, - * java.io.File, java.lang.String) + /** + * Not supported at this time. */ public PZParser newFixedLengthParser(final Connection con, final File dataSource, final String dataDefinition) { - //return new DBFixedLengthPZParser(con, dataSource, dataDefinition); - return null; + throw new RuntimeException("Not supported..."); } - /* - * (non-Javadoc) - * - * @see net.sf.pzfilereader.PZParserFactory#newFixedWidthParser(java.sql.Connection, - * java.io.InputStream, java.lang.String) + /** + * Not supported at this time. */ public PZParser newFixedLengthParser(final Connection con, final InputStream dataSourceStream, final String dataDefinition) { - //return new DBFixedLengthPZParser(con, dataSourceStream, dataDefinition); - return null; + throw new RuntimeException("Not supported..."); } /* @@ -50,8 +80,7 @@ * java.io.File) */ public PZParser newFixedLengthParser(final File pzmapXML, final File dataSource) { - // return new FixedLengthPZParser(pzmapXML, dataSource); - return null; + return new BuffReaderFixedPZParser(pzmapXML, dataSource); } /* @@ -61,20 +90,15 @@ * java.io.InputStream) */ public PZParser newFixedLengthParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) { - // return new FixedLengthPZParser(pzmapXMLStream, dataSourceStream); - return null; + return new BuffReaderFixedPZParser(pzmapXMLStream, dataSourceStream); } - /* - * (non-Javadoc) - * - * @see net.sf.pzfilereader.PZParserFactory#newParser(java.sql.Connection, - * java.io.InputStream, java.lang.String, char, char, boolean) + /** + * Not supported at this time. */ public PZParser newDelimitedParser(final Connection con, final InputStream dataSourceStream, final String dataDefinition, final char delimiter, final char qualifier, final boolean ignoreFirstRecord) { - //return new BuffReaderDelimPZParser(con, dataSourceStream, dataDefinition, delimiter, qualifier, ignoreFirstRecord); - return null; + throw new RuntimeException("Not supported..."); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 23:09:46
|
Revision: 224 http://svn.sourceforge.net/pzfilereader/?rev=224&view=rev Author: zepernick Date: 2006-12-15 15:09:46 -0800 (Fri, 15 Dec 2006) Log Message: ----------- added a bufferedreader parser for fixed width files. renamed the DataSet class and used it for both parsers Removed Paths: ------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java Deleted: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java 2006-12-15 14:43:13 UTC (rev 223) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java 2006-12-15 23:09:46 UTC (rev 224) @@ -1,51 +0,0 @@ -package net.sf.pzfilereader.brparse; - -import java.io.IOException; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TreeMap; - -import net.sf.pzfilereader.DefaultDataSet; -import net.sf.pzfilereader.structure.Row; - -public class BuffReaderDelimPZDataSet extends DefaultDataSet{ - private BuffReaderDelimPZParser brpzparser; - - public BuffReaderDelimPZDataSet(final Map columnMD2, BuffReaderDelimPZParser brpzparser) { - super(columnMD2); - //register the parser with the dataset so we can fetch rows from - //the bufferedreader as needed - this.brpzparser = brpzparser; - } - - public boolean next() { - try { - final Row r = brpzparser.buildRow(this); - - if (r == null) { - setPointer(-1); - return false; - } - - //make sure we have some MD - if (getColumnMD() == null) { - //create a new map so the user cannot change the internal - //DataSet representation of the MD through the parser - setColumnMD(new LinkedHashMap(brpzparser.getColumnMD())); - } - - clearRows(); - addRow(r); - - setPointer(0); - - return true; - - } catch(IOException ex) { - //TODO real logging here - ex.printStackTrace(); - } - - return false; - } -} 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. |
From: <zep...@us...> - 2006-12-15 14:12:11
|
Revision: 222 http://svn.sourceforge.net/pzfilereader/?rev=222&view=rev Author: zepernick Date: 2006-12-15 06:12:11 -0800 (Fri, 15 Dec 2006) Log Message: ----------- added the ability to include / exclude columns from the Excel export Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java 2006-12-15 14:11:31 UTC (rev 221) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java 2006-12-15 14:12:11 UTC (rev 222) @@ -15,6 +15,9 @@ package net.sf.pzfilereader.util; import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; import jxl.Workbook; import jxl.write.Label; @@ -22,18 +25,28 @@ import jxl.write.WritableFont; import jxl.write.WritableSheet; import jxl.write.WritableWorkbook; +import jxl.write.WriteException; import net.sf.pzfilereader.DataSet; /** + * Converts a DataSet object into an excel spreadsheet. + * + * Only detail records will be contained in the export. + * Header / Trailer records defined by <record> tags in the + * pzmap will be ignored on the export. + * * @author Paul Zepernick - * - * Converts a DataSet object into an excel spreadsheet */ public class ExcelTransformer { private DataSet ds; private File xlsFile; + + private String[] exportOnlyColumns; + + private String[] excludeFromExportColumns; + /** * Constructs a new Excel transformer @@ -51,14 +64,20 @@ /** * Writes the Excel file to disk * - * @throws Exception + * @throws IOException + * @thorws WriteException */ - public void writeExcelFile() throws Exception { + public void writeExcelFile() throws IOException, WriteException { WritableWorkbook excelWrkBook = null; int curDsPointer = 0; try { final String[] columnNames = ds.getColumns(); + final List exportOnlyColumnsList = exportOnlyColumns != null ? + Arrays.asList(exportOnlyColumns) : null; + + final List excludeFromExportColumnsList = excludeFromExportColumns != null ? + Arrays.asList(excludeFromExportColumns) : null; // get the current position of the DataSet. We have to go to the top // to do this write, // and we will put the pionter back where it was after we are done @@ -72,16 +91,46 @@ final WritableFont times10pt = new WritableFont(WritableFont.TIMES, 10, WritableFont.NO_BOLD); // write the column headings in the spreadsheet WritableCellFormat cellFormat = new WritableCellFormat(times10ptBold); + int colOffset = 0; for (int i = 0; i < columnNames.length; i++) { - final Label xlsTextLbl = new Label(i, 0, columnNames[i], cellFormat); + if (exportOnlyColumnsList != null) { + if (!exportOnlyColumnsList.contains(columnNames[i])) { + colOffset ++; + continue; + } + } else if (excludeFromExportColumnsList != null) { + if (excludeFromExportColumnsList.contains(columnNames[i])) { + colOffset ++; + continue; + } + } + + final Label xlsTextLbl = new Label(i - colOffset, 0, columnNames[i], cellFormat); wrkSheet.addCell(xlsTextLbl); } cellFormat = new WritableCellFormat(times10pt); int row = 1; while (ds.next()) { + if (!ds.isRecordID(PZConstants.DETAIL_ID)) { + continue; + } + + colOffset = 0; for (int i = 0; i < columnNames.length; i++) { - final Label xlsTextLbl = new Label(i, row, ds.getString(columnNames[i]), cellFormat); + if (exportOnlyColumnsList != null) { + if (!exportOnlyColumnsList.contains(columnNames[i])) { + colOffset ++; + continue; + } + } else if (excludeFromExportColumnsList != null) { + if (excludeFromExportColumnsList.contains(columnNames[i])) { + colOffset ++; + continue; + } + } + + final Label xlsTextLbl = new Label(i - colOffset, row, ds.getString(columnNames[i]), cellFormat); wrkSheet.addCell(xlsTextLbl); } @@ -100,5 +149,29 @@ } } + + + /** + * The columns names contained in the array will be igored if + * setExportOnlyColumns() is called. + * + * Any columns names contained in this list will be excluded from + * the export in Excel. + * + * @param excludeFromExportColumns the excludeFromExportColumns to set + */ + public void setExcludeFromExportColumns(String[] excludeFromExportColumns) { + this.excludeFromExportColumns = excludeFromExportColumns; + } + /** + * When set, only columns contained in the String[] will + * be exported out to Excel. + * + * @param exportOnlyColumns the exportOnlyColumns to set + */ + public void setExportOnlyColumns(String[] exportOnlyColumns) { + this.exportOnlyColumns = exportOnlyColumns; + } + } 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:11:35
|
Revision: 221 http://svn.sourceforge.net/pzfilereader/?rev=221&view=rev Author: zepernick Date: 2006-12-15 06:11:31 -0800 (Fri, 15 Dec 2006) Log Message: ----------- logged change Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2006-12-15 13:44:00 UTC (rev 220) +++ trunk/src/site/changes.xml 2006-12-15 14:11:31 UTC (rev 221) @@ -8,6 +8,7 @@ </properties> <body> <release version="2.3.0" date="in svn" description="Move to Maven and Subversion"> + <action dev="zepernick" type="add">added the ability to limit the column which are exported to Excel in the ExcelTransformer class</action> <action dev="zepernick" type="add">added getObject(String column, Class toConvert) method. PZFileReader will ship with default classes to handle conversions. Custom conversions can be easily added by adding to the pzconvert.properties</action> <action dev="zepernick" type="add">Unqualified elements have leading and trailing whitespace removed in a delimited parse</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2006-12-15 13:44:01
|
Revision: 220 http://svn.sourceforge.net/pzfilereader/?rev=220&view=rev Author: benoitx Date: 2006-12-15 05:44:00 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Added as an example of how to use StatSVN. Added Paths: ----------- trunk/statsvn.bat Added: trunk/statsvn.bat =================================================================== --- trunk/statsvn.bat (rev 0) +++ trunk/statsvn.bat 2006-12-15 13:44:00 UTC (rev 220) @@ -0,0 +1,3 @@ +svn log -v --xml https://svn.sourceforge.net/svnroot/pzfilereader/ > svn.log +rem mkdir target\docs\statsvn +java -jar c:\java\statsvn\statsvn.jar -format xdoc -verbose -tags "^release_2.2.0|^Root_v2_0_0|^Root_v1_0_5|^Root_V2_1_0|^Root_V2_2_0_0/" -output-dir src\site\statsvn -title PZFileReader -exclude "**/qalab.xml|**/SampleCSV.csv" -viewvc http://svn.sourceforge.net/viewvc/pzfilereader/trunk ./svn.log . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 13:23:26
|
Revision: 218 http://svn.sourceforge.net/pzfilereader/?rev=218&view=rev Author: zepernick Date: 2006-12-15 05:23:24 -0800 (Fri, 15 Dec 2006) Log Message: ----------- removed reference to getRows() Modified Paths: -------------- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java =================================================================== --- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java 2006-12-15 13:17:33 UTC (rev 217) +++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java 2006-12-15 13:23:24 UTC (rev 218) @@ -4,7 +4,7 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ -package net.sf.pzfilereader.columninfile; +package net.sf.pzfilereader.columninfile; import junit.framework.TestCase; import net.sf.pzfilereader.DataSet; @@ -49,7 +49,7 @@ ds = testDelimted.getDsForTest(); // check that we parsed in the right amount of rows - assertEquals(6, ds.getRows().size()); + assertEquals(6, ds.getRowCount()); } catch (final Exception ex) { ex.printStackTrace(); Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java =================================================================== --- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java 2006-12-15 13:17:33 UTC (rev 217) +++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java 2006-12-15 13:23:24 UTC (rev 218) @@ -16,7 +16,7 @@ * Preferences - Java - Code Style - Code Templates */ public class TabDelimitedTest extends TestCase { - public TabDelimitedTest(final String name) { + public TabDelimitedTest(final String name) { super(name); } @@ -46,10 +46,10 @@ try { final TabDelimited testTab = new TabDelimited(); - ds = testTab.getDsForTest(); + ds = testTab.getDsForTest(); // check that we parsed in the right amount of rows - assertEquals(2, ds.getRows().size()); + assertEquals(2, ds.getRowCount()); } catch (final Exception ex) { ex.printStackTrace(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 13:17:33
|
Revision: 217 http://svn.sourceforge.net/pzfilereader/?rev=217&view=rev Author: zepernick Date: 2006-12-15 05:17:33 -0800 (Fri, 15 Dec 2006) Log Message: ----------- added a protected method to clear the rows out of the DataSet Changed the BuffredReader parser to call clear rows instead of using the getRows which was removed. Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-15 13:16:19 UTC (rev 216) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-15 13:17:33 UTC (rev 217) @@ -254,15 +254,6 @@ /* * (non-Javadoc) * - * @see net.sf.pzfilereader.IDataSet#getRows() - */ - public List getRows() { - return rows; - } - - /* - * (non-Javadoc) - * * @see net.sf.pzfilereader.IDataSet#getString(java.lang.String) */ public String getString(final String column) { @@ -460,6 +451,12 @@ this.pointer = pointer; } - + /** + * Clears all of the in memory rows of the DataSet + * + */ + protected void clearRows() { + rows.clear(); + } } Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java 2006-12-15 13:16:19 UTC (rev 216) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZDataSet.java 2006-12-15 13:17:33 UTC (rev 217) @@ -34,7 +34,7 @@ setColumnMD(new LinkedHashMap(brpzparser.getColumnMD())); } - getRows().clear(); + clearRows(); addRow(r); setPointer(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2006-12-15 13:16:18
|
Revision: 216 http://svn.sourceforge.net/pzfilereader/?rev=216&view=rev Author: zepernick Date: 2006-12-15 05:16:19 -0800 (Fri, 15 Dec 2006) Log Message: ----------- removed the getRows() so the user cannot manipulate the internal structure of the DataSet Modified Paths: -------------- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java =================================================================== --- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2006-12-15 02:07:56 UTC (rev 215) +++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2006-12-15 13:16:19 UTC (rev 216) @@ -231,7 +231,6 @@ */ void orderRows(final OrderBy ob) throws Exception; - List getRows(); /** * Sets data in the DataSet to lowercase This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |