Menu
▾
▴
[flatpack-svn] SF.net SVN: flatpack: [338] trunk/flatpack/src/main/java/net/sf/flatpack
|
From: <be...@us...> - 2007-07-31 22:21:10
|
Revision: 338
http://flatpack.svn.sourceforge.net/flatpack/?rev=338&view=rev
Author: benoitx
Date: 2007-07-31 15:21:10 -0700 (Tue, 31 Jul 2007)
Log Message:
-----------
Bit of tidy up. the doParse method ought to be protected as it is invalid to call directly (called through parse method).
Modified Paths:
--------------
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-07-30 20:22:12 UTC (rev 337)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-07-31 22:21:10 UTC (rev 338)
@@ -57,30 +57,6 @@
private final Logger logger = LoggerFactory.getLogger(AbstractDelimiterParser.class);
- /*public AbstractDelimiterPZParser(final InputStream dataSourceStream, final String dataDefinition, final char delimiter,
- final char qualifier, final boolean ignoreFirstRecord) {
- super(dataSourceStream, dataDefinition);
- this.delimiter = delimiter;
- this.qualifier = qualifier;
- this.ignoreFirstRecord = ignoreFirstRecord;
- }
-
- public AbstractDelimiterPZParser(final File dataSource, final char delimiter, final char qualifier,
- final boolean ignoreFirstRecord) {
- super(dataSource);
- this.delimiter = delimiter;
- this.qualifier = qualifier;
- this.ignoreFirstRecord = ignoreFirstRecord;
- }
-
- public AbstractDelimiterPZParser(final InputStream dataSourceStream, final char delimiter, final char qualifier,
- final boolean ignoreFirstRecord) {
- super(dataSourceStream);
- this.delimiter = delimiter;
- this.qualifier = qualifier;
- this.ignoreFirstRecord = ignoreFirstRecord;
- }*/
-
public AbstractDelimiterParser(final Reader dataSourceReader, final String dataDefinition, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
super(dataSourceReader, dataDefinition);
@@ -96,23 +72,10 @@
this.ignoreFirstRecord = ignoreFirstRecord;
}
- public DataSet doParse() {
+ protected DataSet doParse() {
try {
lineCount = 0;
return doDelimitedFile(getDataSourceReader(), shouldCreateMDFromFile());
- /* if (getDataSourceStream() != null) {
- return doDelimitedFile(getDataSourceStream(), shouldCreateMDFromFile());
- } else {
- InputStream stream = null;
- try {
- stream = ParserUtils.createInputStream(getDataSource());
- return doDelimitedFile(stream, shouldCreateMDFromFile());
- } finally {
- if (stream != null) {
- stream.close();
- }
- }
- }*/
} catch (final IOException e) {
logger.error("error accessing/creating inputstream", e);
}
@@ -161,15 +124,11 @@
throw new NullPointerException("dataSource is null");
}
BufferedReader br = null;
- // final DefaultDataSet ds = new DefaultDataSet(getColumnMD(), this);
final DefaultDataSet ds = new DefaultDataSet(getPzMetaData(), this);
try {
//gather the conversion properties
ds.setPZConvertProps(ParserUtils.loadConvertProperties());
- // get the total column count
- // columnCount = columnMD.size();
-
br = new BufferedReader(dataSource);
boolean processedFirst = false;
@@ -182,9 +141,7 @@
continue;
} else if (!processedFirst && createMDFromFile) {
processedFirst = true;
- // setColumnMD(ParserUtils.getColumnMDFromFile(line, delimiter, qualifier, this));
setPzMetaData(ParserUtils.getPZMetaDataFromFile(line, delimiter, qualifier, this));
- // ds.setColumnMD(getColumnMD());
ds.setMetaData(getPzMetaData());
continue;
}
@@ -192,8 +149,6 @@
// column values
List columns = ParserUtils.splitLine(line, getDelimiter(), getQualifier(), FPConstants.SPLITLINE_SIZE_INIT);
final String mdkey = ParserUtils.getCMDKeyForDelimitedFile(getPzMetaData(), columns);
- // final String mdkey = ParserUtils.getCMDKeyForDelimitedFile(getColumnMD(), columns);
- // final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
final List cmds = ParserUtils.getColumnMetaData(mdkey, getPzMetaData());
final int columnCount = cmds.size();
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-07-30 20:22:12 UTC (rev 337)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-07-31 22:21:10 UTC (rev 338)
@@ -53,22 +53,6 @@
public abstract class AbstractFixedLengthParser extends AbstractParser {
private final Logger logger = LoggerFactory.getLogger(AbstractFixedLengthParser.class);
- /* protected AbstractFixedLengthPZParser(final File dataSource, final String dataDefinition) {
- super(dataSource, dataDefinition);
- }
-
- protected AbstractFixedLengthPZParser(final File dataSource) {
- super(dataSource);
- }
-
- protected AbstractFixedLengthPZParser(final InputStream dataSourceStream, final String dataDefinition) {
- super(dataSourceStream, dataDefinition);
- }
-
- protected AbstractFixedLengthPZParser(final InputStream dataSourceStream) {
- super(dataSourceStream);
- }*/
-
protected AbstractFixedLengthParser(final Reader dataSourceReader, final String dataDefinition) {
super(dataSourceReader, dataDefinition);
}
@@ -77,21 +61,8 @@
super(dataSourceReader);
}
- public DataSet doParse() {
+ protected DataSet doParse() {
try {
- /* if (getDataSourceStream() != null) {
- return doFixedLengthFile(getDataSourceStream());
- } else {
- InputStream stream;
- stream = ParserUtils.createInputStream(getDataSource());
- try {
- return doFixedLengthFile(stream);
- } finally {
- if (stream != null) {
- stream.close();
- }
- }
- }*/
return doFixedLengthFile(getDataSourceReader());
} catch (final IOException e) {
logger.error("error accessing/reading data", e);
@@ -109,14 +80,12 @@
private DataSet doFixedLengthFile(final Reader dataSource) throws IOException {
BufferedReader br = null;
- // final DefaultDataSet ds = new DefaultDataSet(getColumnMD(), this);
final DefaultDataSet ds = new DefaultDataSet(getPzMetaData(), this);
try {
//gather the conversion properties
ds.setPZConvertProps(ParserUtils.loadConvertProperties());
- // final Map recordLengths = ParserUtils.calculateRecordLengths(getColumnMD());
final Map recordLengths = ParserUtils.calculateRecordLengths(getPzMetaData());
// Read in the flat file
@@ -134,7 +103,6 @@
}
final String mdkey = FixedWidthParserUtils.getCMDKey(getPzMetaData(), line);
- // final String mdkey = FixedWidthParserUtils.getCMDKey(getColumnMD(), line);
final int recordLength = ((Integer) recordLengths.get(mdkey)).intValue();
if (line.length() > recordLength) {
@@ -168,18 +136,8 @@
final Row row = new Row();
row.setMdkey(mdkey.equals(FPConstants.DETAIL_ID) ? null : mdkey); // try
- // final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
final List cmds = ParserUtils.getColumnMetaData(mdkey, getPzMetaData());
row.addColumn(FixedWidthParserUtils.splitFixedText(cmds, line));
- // to limit the memory use
- // Build the columns for the row
- // for (int i = 0; i < cmds.size(); i++) {
- // final String tempValue = line.substring(recPosition - 1,
- // recPosition
- // + (((ColumnMetaData) cmds.get(i)).getColLength() - 1));
- // recPosition += ((ColumnMetaData) cmds.get(i)).getColLength();
- // row.addColumn(tempValue.trim());
- // }
row.setRowNumber(lineCount);
// add the row to the array
ds.addRow(row);
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-07-30 20:22:12 UTC (rev 337)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-07-31 22:21:10 UTC (rev 338)
@@ -145,13 +145,6 @@
}
}
- // protected void addToColumnMD(final Object key, final Object value) {
- // if (columnMD == null) {
- // columnMD = new LinkedHashMap();
- // }
- // columnMD.put(key, value);
- // }
-
protected boolean isInitialised() {
return initialised;
}
@@ -168,25 +161,6 @@
this.dataDefinition = dataDefinition;
}
- /* protected File getDataSource() {
- return dataSource;
- }
-
- protected void setDataSource(final File dataSource) {
- this.dataSource = dataSource;
- }
-
- protected InputStream getDataSourceStream() {
- return dataSourceStream;
- }
-
- protected void setDataSourceStream(final InputStream dataSourceStream) {
- this.dataSourceStream = dataSourceStream;
- }*/
-
- // protected Map getColumnMD() {
- // return columnMD;
- // }
/**
* Adds a new error to this DataSet. These can be collected, and retreived
* after processing
@@ -252,5 +226,4 @@
public void setPzMetaData(final MetaData pzMap) {
this.pzMetaData = pzMap;
}
-
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2007-07-30 20:22:12 UTC (rev 337)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2007-07-31 22:21:10 UTC (rev 338)
@@ -83,7 +83,7 @@
super(dataSourceStream, delimiter, qualifier, ignoreFirstRecord);
}
- public DataSet doParse() {
+ protected DataSet doParse() {
// final DataSet ds = new BuffReaderPZDataSet(getColumnMD(), this);
final DataSet ds = new BuffReaderDataSet(getPzMetaData(), this);
try {
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2007-07-30 20:22:12 UTC (rev 337)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2007-07-31 22:21:10 UTC (rev 338)
@@ -72,11 +72,9 @@
super(pzmapXML, dataSource);
}
- public DataSet doParse() {
- // final DataSet ds = new BuffReaderPZDataSet(getColumnMD(), this);
+ protected DataSet doParse() {
final DataSet ds = new BuffReaderDataSet(getPzMetaData(), this);
lineCount = 0;
- // recordLengths = ParserUtils.calculateRecordLengths(getColumnMD());
recordLengths = ParserUtils.calculateRecordLengths(getPzMetaData());
try {
//gather the conversion properties
@@ -110,7 +108,6 @@
continue;
}
- // final String mdkey = FixedWidthParserUtils.getCMDKey(getColumnMD(), line);
final String mdkey = FixedWidthParserUtils.getCMDKey(getPzMetaData(), line);
final int recordLength = ((Integer) recordLengths.get(mdkey)).intValue();
@@ -144,7 +141,6 @@
final Row row = new Row();
row.setMdkey(mdkey.equals(FPConstants.DETAIL_ID) ? null : mdkey);
- // final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
final List cmds = ParserUtils.getColumnMetaData(mdkey, getPzMetaData());
row.addColumn(FixedWidthParserUtils.splitFixedText(cmds, line));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
