Menu
▾
▴
flatpack-svn — Subversion commits
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...> - 2007-01-18 14:31:57
|
Revision: 265
http://svn.sourceforge.net/pzfilereader/?rev=265&view=rev
Author: zepernick
Date: 2007-01-18 06:31:48 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
added section on SLF4J
Modified Paths:
--------------
trunk/src/site/index.xml
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2007-01-18 14:29:09 UTC (rev 264)
+++ trunk/src/site/index.xml 2007-01-18 14:31:48 UTC (rev 265)
@@ -148,6 +148,27 @@
</pre></div>
</subsection>
+
+ <subsection name="Using SLF4J With PZFileReader">
+
+ <div class="source"><pre>
+ Slf4j is utilized to capture logging information that occurred during a parse.
+ By default, this information will be logged to the console. SLF supports the following loggers; log4j, jcl, nop, and jdk1.4.
+ Please go to http://www.slf4j.org to download the proper jar for your logging preference. Here is a typical SLF4j setup:
+
+ SLF-api-XXX.jar + SLF-MyLoggerPreference.jar + MyLogger.jar (lo4j.jar for example)
+
+ Here are the steps that would need to be taken for log4j:
+
+ 1. Install log4j.jar
+ 2. Setup log4j.properties or log4j.xml
+ 3. Install SLF-api-XXX.jar
+ 4. Install SLF-log4j12-XXX.jar
+
+ </pre></div>
+
+ </subsection>
+
</section>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-18 14:29:15
|
Revision: 264
http://svn.sourceforge.net/pzfilereader/?rev=264&view=rev
Author: zepernick
Date: 2007-01-18 06:29:09 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
added change for SLF4J
Modified Paths:
--------------
trunk/src/site/changes.xml
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-10 20:02:59 UTC (rev 263)
+++ trunk/src/site/changes.xml 2007-01-18 14:29:09 UTC (rev 264)
@@ -8,6 +8,8 @@
</properties>
<body>
<release version="3.0.0" date="in svn" description="Move to Maven and Subversion">
+ <action dev="zepernick" type="change">Added new dependency, SLF4j. This is used to log parsing issues. SLF4j is a facade
+ to the following loggers; log4j, jcl, nop, and jdk 1.4. See 3.0 User Doc for further instruction.</action>
<action dev="zepernick" type="change">DataSet.getDate() will now return a null on empty Strings</action>
<action dev="zepernick" type="change">Removed ParserUtils.getColumnMDFromFile(InputStream, String, String) this method
was deprecated in 2.2</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-10 20:03:06
|
Revision: 263
http://svn.sourceforge.net/pzfilereader/?rev=263&view=rev
Author: zepernick
Date: 2007-01-10 12:02:59 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
changed getDate() to return a null on empty Strings instead of getting a parse exception
Modified Paths:
--------------
trunk/src/site/changes.xml
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-10 20:02:45 UTC (rev 262)
+++ trunk/src/site/changes.xml 2007-01-10 20:02:59 UTC (rev 263)
@@ -7,7 +7,8 @@
<title>Changes</title>
</properties>
<body>
- <release version="2.3.0" date="in svn" description="Move to Maven and Subversion">
+ <release version="3.0.0" date="in svn" description="Move to Maven and Subversion">
+ <action dev="zepernick" type="change">DataSet.getDate() will now return a null on empty Strings</action>
<action dev="zepernick" type="change">Removed ParserUtils.getColumnMDFromFile(InputStream, String, String) this method
was deprecated in 2.2</action>
<action dev="zepernick" type="change">Removed setters and default constructor from DataError. Error properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-10 20:02:48
|
Revision: 262
http://svn.sourceforge.net/pzfilereader/?rev=262&view=rev
Author: zepernick
Date: 2007-01-10 12:02:45 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
changed getDate() to return a null on empty Strings instead of getting a parse exception
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2007-01-10 17:01:29 UTC (rev 261)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2007-01-10 20:02:45 UTC (rev 262)
@@ -107,6 +107,8 @@
* yyyyMMdd. If your date is not in this format, see
* getDate(String,SimpleDateFormat)
*
+ * Will return "null" on empty Strings
+ *
* @param column -
* Name of the column
* @exception ParseException
@@ -119,6 +121,8 @@
* date is NOT in yyyyMMdd format. The SimpleDateFormat object will specify
* what kind of format the date is in.
*
+ * Will return "null" on empty Strings
+ *
* @param column -
* Name of the column
* @param sdf -
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2007-01-10 17:01:29 UTC (rev 261)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2007-01-10 20:02:45 UTC (rev 262)
@@ -136,10 +136,7 @@
* @see net.sf.pzfilereader.IDataSet#getDate(java.lang.String)
*/
public Date getDate(final String column) throws ParseException {
- final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
- return sdf.parse(s);
+ return getDate(column, new SimpleDateFormat("yyyyMMdd"));
}
/*
@@ -151,6 +148,10 @@
public Date getDate(final String column, final SimpleDateFormat sdf) throws ParseException {
final Row row = (Row) rows.get(pointer);
final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ if (s.trim().equals("")) {
+ //don't do the parse on empties
+ return null;
+ }
return sdf.parse(s);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-10 17:01:35
|
Revision: 261
http://svn.sourceforge.net/pzfilereader/?rev=261&view=rev
Author: zepernick
Date: 2007-01-10 09:01:29 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
fixed NPE when referencing a column that did not exist in the map for a fixed length file
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2007-01-02 23:20:18 UTC (rev 260)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2007-01-10 17:01:29 UTC (rev 261)
@@ -645,7 +645,10 @@
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);
- idx = ((Integer) map.get(colName)).intValue();
+ final Integer i = (Integer) map.get(colName);
+ if (i != null) { //happens when the col name does not exist in the mapping
+ idx = i.intValue();
+ }
}
if (idx < 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-02 23:20:21
|
Revision: 260
http://svn.sourceforge.net/pzfilereader/?rev=260&view=rev
Author: zepernick
Date: 2007-01-02 15:20:18 -0800 (Tue, 02 Jan 2007)
Log Message:
-----------
updated version number to 3.0.0
Modified Paths:
--------------
trunk/common-build/project.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2007-01-02 23:11:55 UTC (rev 259)
+++ trunk/common-build/project.xml 2007-01-02 23:20:18 UTC (rev 260)
@@ -27,7 +27,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
<pomVersion>3</pomVersion>
<groupId>net.sf.pzfilereader</groupId>
- <currentVersion>2.3.0</currentVersion>
+ <currentVersion>3.0.0</currentVersion>
<organization>
<name>ObjectLab Financial Ltd</name>
<url>http://www.objectlab.co.uk</url>
@@ -163,7 +163,7 @@
<build>
<!-- We need to put here something other when we release it or I'll receive the emails from
everyone who tries to use the project... -->
- <nagEmailAddress>ki...@ob...</nagEmailAddress>
+ <nagEmailAddress>pze...@gm...</nagEmailAddress>
<defaultGoal>pz:build</defaultGoal>
</build>
@@ -184,9 +184,9 @@
<versions>
<version>
- <id>2.3.0</id>
- <name>2.3.0</name>
- <tag>2.3.0</tag>
+ <id>3.0.0</id>
+ <name>3.0.0</name>
+ <tag>3.0.0</tag>
</version>
<version>
<id>2.2.0</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2007-01-02 23:11:54
|
Revision: 259
http://svn.sourceforge.net/pzfilereader/?rev=259&view=rev
Author: zepernick
Date: 2007-01-02 15:11:55 -0800 (Tue, 02 Jan 2007)
Log Message:
-----------
updated classpath with SLF4j and changed to 3.0.0 jar for pz
Modified Paths:
--------------
trunk/PZFileReaderSamples/.classpath
Modified: trunk/PZFileReaderSamples/.classpath
===================================================================
--- trunk/PZFileReaderSamples/.classpath 2006-12-31 19:09:51 UTC (rev 258)
+++ trunk/PZFileReaderSamples/.classpath 2007-01-02 23:11:55 UTC (rev 259)
@@ -2,8 +2,10 @@
<classpath>
<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
<classpathentry path="src/main/java" kind="src"/>
- <classpathentry sourcepath="/PZ_SRC_HOME" path="MAVEN_REPO/net.sf.pzfilereader/jars/pzfilereader-2.3.0.jar" kind="var"/>
+ <classpathentry sourcepath="/PZ_SRC_HOME" path="MAVEN_REPO/net.sf.pzfilereader/jars/pzfilereader-3.0.0.jar" kind="var"/>
<classpathentry path="MAVEN_REPO/jdom/jars/jdom-1.0.jar" kind="var"/>
<classpathentry path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar" kind="var"/>
+ <classpathentry path="MAVEN_REPO/org.slf4j/jars/slf4j-api-1.1.0-RC1.jar" kind="var"/>
+ <classpathentry path="MAVEN_REPO/org.slf4j/jars/slf4j-simple-1.1.0-RC1.jar" kind="var"/>
<classpathentry path="target/classes" kind="output"/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-31 19:09:51
|
Revision: 258
http://svn.sourceforge.net/pzfilereader/?rev=258&view=rev
Author: zepernick
Date: 2006-12-31 11:09:51 -0800 (Sun, 31 Dec 2006)
Log Message:
-----------
attempt to auto close file handles on GC if the close() was not called.
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.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-25 14:51:07 UTC (rev 257)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-31 19:09:51 UTC (rev 258)
@@ -179,12 +179,26 @@
public void close() throws IOException{
if (br != null) {
br.close();
+ br = null;
}
if (isr != null) {
isr.close();
+ isr = null;
}
}
+ //try to clean up the file handles automatically if
+ //the close was not called
+ protected void finalize() throws Throwable {
+ try {
+ close();
+ } catch (IOException ex) {
+ logger.warn("Problem trying to auto close file handles...", ex);
+ } finally {
+ super.finalize();
+ }
+ }
+
/**
* Returns the meta data describing the columns.
* This exposes this method to the DataSet which
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-25 14:51:07 UTC (rev 257)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-31 19:09:51 UTC (rev 258)
@@ -165,6 +165,17 @@
}
}
+ //try to clean up the file handles automatically if
+ //the close was not called
+ protected void finalize() throws Throwable {
+ try {
+ close();
+ } catch (IOException ex) {
+ logger.warn("Problem trying to auto close file handles...", ex);
+ } finally {
+ super.finalize();
+ }
+ }
/**
* Returns the meta data describing the columns
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 257
http://svn.sourceforge.net/pzfilereader/?rev=257&view=rev
Author: zepernick
Date: 2006-12-25 06:51:07 -0800 (Mon, 25 Dec 2006)
Log Message:
-----------
fixed imports
Modified Paths:
--------------
trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java
Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java
===================================================================
--- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-12-25 14:50:11 UTC (rev 256)
+++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java 2006-12-25 14:51:07 UTC (rev 257)
@@ -7,12 +7,9 @@
import java.io.File;
-import com.sun.jmx.snmp.defaults.DefaultPaths;
-
import net.sf.pzfilereader.DataError;
import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.DefaultPZParserFactory;
-import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.PZParser;
import net.sf.pzfilereader.ordering.OrderBy;
import net.sf.pzfilereader.ordering.OrderColumn;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-25 14:50:10
|
Revision: 256
http://svn.sourceforge.net/pzfilereader/?rev=256&view=rev
Author: zepernick
Date: 2006-12-25 06:50:11 -0800 (Mon, 25 Dec 2006)
Log Message:
-----------
updated examples for 3.0
Modified Paths:
--------------
trunk/src/site/index.xml
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2006-12-24 18:07:03 UTC (rev 255)
+++ trunk/src/site/index.xml 2006-12-25 14:50:11 UTC (rev 256)
@@ -71,37 +71,66 @@
<section name="How do I use it?">
<p>Basic Steps</p>
- <ol>
- <li>Construct DataSet() with a File, a InputStream or a Reader (soon)</li>
+ <ol>
+ <li>Obtain a PZParser from a parser factory (DefaultPZParserFactory) witha File, InputStream, or a reader(coming soon)</li>
+ <li>Set additional PZParser options, PZParser.setAnOption()</li>
+ <li>Obtain a DataSet PZParser.parse()</li>
<li>Call DataSet.next() to advance record pointer</li>
<li>Process columns; DataSet.getString("colname"), getInt("colname"), getDouble("colname"), getDate("colname"), etc</li>
<li>Check for parse errors; DataSet.getErrors()</li>
- <li>Release memory early; DataSet.freeMemory()</li>
</ol>
- <subsection name="Reading Delimited File">
+ <subsection name="Reading Delimited File With Column Mapping">
- <div class="source"><pre>
- //construct DataSet
- DataSet ds = new DataSet(new File("ColumnMappings.pzmap.xml"), //xml mapping file
- new File("delimitedfile.txt"), //text file to parse
- ",", //delimiter
- "\"", //text qualifier (can be null or empty)
- true); //pad out missing columns (we mapped 5 columns but only 3 were there)
+ <div class="source"><pre>
+ //Obtain the proper parser for your needs
+ PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(
+ new File("map.pzmap.xml"), //xml column mapping
+ new File("DataFile.txt"), //txt file to parse
+ ',', //delimiter
+ '"', //text qualfier
+ false); //ignore the first record (may need to be done if first record contain column names)
+
+ //obtain DataSet
+ DataSet ds = pzparser.parse();
while (ds.next()){ //loop through file
ds.getString("mycolumnName");
}
</pre></div>
- </subsection>
+ </subsection>
+
+ <subsection name="Reading Delimited File Column Names In First Record Of File">
+
+ <div class="source"><pre>
+ //Obtain the proper parser for your needs
+ PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(
+ new File("DataFile.txt"), //txt file to parse
+ ',', //delimiter
+ '"'); //text qualifier
+
+ //obtain DataSet
+ DataSet ds = pzparser.parse();
+
+ while (ds.next()){ //loop through file
+ ds.getString("mycolumnName");
+ }
+ </pre></div>
+
+ </subsection>
+
<subsection name="Reading Fixed Width File">
- <div class="source"><pre>
- //construct DataSet
- DataSet ds = new DataSet(new File("PEOPLE-FixedLength.pzmap.xml"), //xml mapping file
- new File("PEOPLE-FixedLength.txt")); //text file to parse
+ <div class="source"><pre>
+ //Obtain the proper parser for your needs
+ PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(
+ new File("map.pzmap.xml"), //fixed with column map
+ new File("DataFile.txt")); //txt file to parse
+
+ //obtain DataSet
+ DataSet ds = pzparser.parse();
while (ds.next()){ //loop through file
ds.getString("mycolumnName");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-24 18:07:05
|
Revision: 255
http://svn.sourceforge.net/pzfilereader/?rev=255&view=rev
Author: zepernick
Date: 2006-12-24 10:07:03 -0800 (Sun, 24 Dec 2006)
Log Message:
-----------
added SLF4J logging
Modified Paths:
--------------
trunk/common-build/project.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-12-24 17:53:35 UTC (rev 254)
+++ trunk/common-build/project.xml 2006-12-24 18:07:03 UTC (rev 255)
@@ -144,6 +144,20 @@
<type>jar</type>
<url>http://sourceforge.net/projects/jexcelapi</url>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.1.0-RC1</version>
+ <type>jar</type>
+ <url>http://www.slf4j.org</url>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.1.0-RC1</version>
+ <type>jar</type>
+ <url>http://www.slf4j.org</url>
+ </dependency>
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-24 17:53:36
|
Revision: 254
http://svn.sourceforge.net/pzfilereader/?rev=254&view=rev
Author: zepernick
Date: 2006-12-24 09:53:35 -0800 (Sun, 24 Dec 2006)
Log Message:
-----------
added SLF4J logging...
Benoit,
I will follow up with an email with some of the details of the logger.
It is pretty simplistic.
Paul
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.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-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -39,6 +39,9 @@
import java.io.InputStreamReader;
import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.sf.pzfilereader.structure.Row;
import net.sf.pzfilereader.util.PZConstants;
import net.sf.pzfilereader.util.ParserUtils;
@@ -55,7 +58,9 @@
private boolean ignoreFirstRecord = false;
private int lineCount = 0;
-
+
+ private final Logger logger = LoggerFactory.getLogger(AbstractDelimiterPZParser.class);
+
public AbstractDelimiterPZParser(final InputStream dataSourceStream, final String dataDefinition, final char delimiter,
final char qualifier, final boolean ignoreFirstRecord) {
super(dataSourceStream, dataDefinition);
@@ -97,8 +102,7 @@
}
}
} catch (final IOException e) {
- // TODO add logger
- e.printStackTrace();
+ logger.error("error accessing/creating inputstream", e);
}
return null;
}
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -34,13 +34,15 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.sf.pzfilereader.structure.Row;
import net.sf.pzfilereader.util.FixedWidthParserUtils;
import net.sf.pzfilereader.util.PZConstants;
@@ -51,7 +53,8 @@
*
*/
public abstract class AbstractFixedLengthPZParser extends AbstractPZParser {
-
+ private final Logger logger = LoggerFactory.getLogger(AbstractFixedLengthPZParser.class);
+
protected AbstractFixedLengthPZParser(final File dataSource, final String dataDefinition) {
super(dataSource, dataDefinition);
}
@@ -77,21 +80,14 @@
stream = ParserUtils.createInputStream(getDataSource());
try {
return doFixedLengthFile(stream);
- } 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
- e.printStackTrace();
- } catch (final Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (final IOException e) {
+ logger.error("error accessing/creating inputstream", e);
}
return null;
}
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-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -40,6 +40,9 @@
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.DefaultDataSet;
import net.sf.pzfilereader.DelimiterPZParser;
@@ -49,8 +52,12 @@
public class BuffReaderDelimPZParser extends DelimiterPZParser {
private BufferedReader br;
+
private InputStreamReader isr;
+
private boolean processedFirst = false;
+
+ private final Logger logger = LoggerFactory.getLogger(BuffReaderDelimPZParser.class);
public BuffReaderDelimPZParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
@@ -88,7 +95,7 @@
return ds;
} catch(IOException ex) {
- ex.printStackTrace();
+ logger.error("error accessing/creating inputstream", ex);
}
return null;
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -40,6 +40,9 @@
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.DefaultDataSet;
import net.sf.pzfilereader.FixedLengthPZParser;
@@ -57,6 +60,8 @@
private Map recordLengths = null;
+ private final Logger logger = LoggerFactory.getLogger(BuffReaderFixedPZParser.class);
+
public BuffReaderFixedPZParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) {
super(pzmapXMLStream, dataSourceStream);
}
@@ -84,7 +89,7 @@
return ds;
} catch(IOException ex) {
- ex.printStackTrace();
+ logger.error("error accessing/creating inputstream", ex);
}
return null;
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-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -36,6 +36,9 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.sf.pzfilereader.DefaultDataSet;
import net.sf.pzfilereader.ordering.OrderBy;
import net.sf.pzfilereader.structure.Row;
@@ -45,6 +48,8 @@
private final BuffReaderFixedPZParser brFixedPzParser;
+ private final Logger logger = LoggerFactory.getLogger(BuffReaderPZDataSet.class);
+
public BuffReaderPZDataSet(final Map columnMD2, final BuffReaderDelimPZParser brDelimPzParser) {
super(columnMD2);
//register the parser with the dataset so we can fetch rows from
@@ -95,8 +100,7 @@
return true;
} catch(final IOException ex) {
- //TODO real logging here
- ex.printStackTrace();
+ logger.error("error building Row on next()", ex);
}
return false;
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-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -51,6 +51,8 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author zepernick
@@ -59,7 +61,8 @@
*/
public final class PZMapParser {
private static boolean showDebug = false;
-
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PZMapParser.class);
/**
* Constructor
*
@@ -223,15 +226,15 @@
columns = xmlrecEle.getColumns().iterator();
}
- System.out.println(">>>>Column MD Id: " + recordID);
+ LOGGER.debug(">>>>Column MD Id: " + recordID);
if (xmlrecEle != null) {
- System.out.println("Start Position: " + xmlrecEle.getStartPosition() + " " + "End Position: "
+ LOGGER.debug("Start Position: " + xmlrecEle.getStartPosition() + " " + "End Position: "
+ xmlrecEle.getEndPositition() + " " + "Element Number: " + xmlrecEle.getElementNumber() + " "
+ "Indicator: " + xmlrecEle.getIndicator());
}
while (columns.hasNext()) {
final ColumnMetaData cmd = (ColumnMetaData) columns.next();
- System.out.println(" Column Name: " + cmd.getColName() + " LENGTH: " + cmd.getColLength());
+ LOGGER.debug("Column Name: " + cmd.getColName() + " LENGTH: " + cmd.getColLength());
}
}
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-21 20:58:52 UTC (rev 253)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java 2006-12-24 17:53:35 UTC (rev 254)
@@ -61,7 +61,9 @@
if (resource != null) {
return new InputSource(resource.openStream());
} else {
- throw new RuntimeException("could not load dtd resource from jar!!");
+ //should probably not happen, this may indicate that the dtd has been
+ //removed from the jar for some reason
+ throw new IOException("could not load dtd resource from jar!!");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-21 20:58:53
|
Revision: 253
http://svn.sourceforge.net/pzfilereader/?rev=253&view=rev
Author: zepernick
Date: 2006-12-21 12:58:52 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
added setValue method back into the DataSet.
This was present in previous versions. It can be used to change
the value of a column after the file read. It is useful to loop through the
file and change values prior to business logic, or to change the values before they
go out to Excel.
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2006-12-16 21:26:27 UTC (rev 252)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2006-12-21 20:58:52 UTC (rev 253)
@@ -280,4 +280,15 @@
* Property mapping for String to Object conversion
*/
void setPZConvertProps(Properties props);
+
+ /**
+ * Changes the value of the given column only for the
+ * given row which the pointer is currently sitting on.
+ *
+ * @param column
+ * Column name to set the value for
+ * @param value
+ * Value to change the column to
+ */
+ void setValue(final String column, final String value);
}
\ No newline at end of file
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-16 21:26:27 UTC (rev 252)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-21 20:58:52 UTC (rev 253)
@@ -275,6 +275,14 @@
// return value as how it is in the file
return s;
}
+
+
+ public void setValue(String column, String value) {
+ final Row row = (Row) rows.get(pointer);
+ final int colIndex = ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column);
+
+ row.setValue(colIndex, value);
+ }
/*
* (non-Javadoc)
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 21:26:27 UTC (rev 252)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-21 20:58:52 UTC (rev 253)
@@ -159,5 +159,12 @@
public void goTop() {
throw new UnsupportedOperationException("goTop() is Not Implemented");
}
+
+ /**
+ * Not Supported!
+ */
+ public void setValue(String column, String value) {
+ throw new UnsupportedOperationException("setValue() is Not Implemented");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-16 21:26:26
|
Revision: 252
http://svn.sourceforge.net/pzfilereader/?rev=252&view=rev
Author: zepernick
Date: 2006-12-16 13:26:27 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
added exceptions for unsupported methods
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 21:05:33 UTC (rev 251)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 21:26:27 UTC (rev 252)
@@ -37,6 +37,7 @@
import java.util.Map;
import net.sf.pzfilereader.DefaultDataSet;
+import net.sf.pzfilereader.ordering.OrderBy;
import net.sf.pzfilereader.structure.Row;
public class BuffReaderPZDataSet extends DefaultDataSet{
@@ -100,4 +101,63 @@
return false;
}
+
+ /**
+ * Not Supported!
+ * @return boolean
+ */
+ public boolean previous() {
+ throw new UnsupportedOperationException("previous() is Not Implemented");
+ }
+
+
+ /**
+ * Not Supported!
+ * @param ob - OrderBy object
+ * @exception Exception
+ * @see com.pz.reader.ordering.OrderBy
+ * @see com.pz.reader.ordering.OrderColumn
+ */
+ public void orderRows(OrderBy ob) throws Exception{
+ throw new UnsupportedOperationException("orderRows() is Not Implemented");
+ }
+
+ /**
+ * Not Supported!
+ * @param localPointer - int
+ * @exception IndexOutOfBoundsException
+ */
+ public void absolute(int localPointer) {
+ throw new UnsupportedOperationException("absolute() is Not Implemented");
+ }
+
+ /**
+ *Not Supported!
+ */
+ public void remove() {
+ throw new UnsupportedOperationException("remove() is Not Implemented");
+ }
+
+ /**
+ * Not Supported!
+ * @return int
+ */
+ public int getIndex() {
+ throw new UnsupportedOperationException("getIndex() is Not Implemented");
+ }
+
+ /**
+ * Not Supported!
+ */
+ public void goBottom() {
+ throw new UnsupportedOperationException("goBottom() is Not Implemented");
+ }
+
+ /**
+ * Not Supported!
+ */
+ public void goTop() {
+ throw new UnsupportedOperationException("goTop() is Not Implemented");
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:05:32
|
Revision: 251
http://svn.sourceforge.net/pzfilereader/?rev=251&view=rev
Author: benoitx
Date: 2006-12-16 13:05:33 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
Should the br and recordLengths be initialised to something else?
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-16 21:04:55 UTC (rev 250)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderFixedPZParser.java 2006-12-16 21:05:33 UTC (rev 251)
@@ -49,13 +49,13 @@
import net.sf.pzfilereader.util.ParserUtils;
public class BuffReaderFixedPZParser extends FixedLengthPZParser{
- private BufferedReader br;
+ private BufferedReader br = null;
private InputStreamReader isr;
private int lineCount = 0;
- private Map recordLengths;
+ private Map recordLengths = null;
public BuffReaderFixedPZParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) {
super(pzmapXMLStream, dataSourceStream);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-16 21:04:54
|
Revision: 250
http://svn.sourceforge.net/pzfilereader/?rev=250&view=rev
Author: zepernick
Date: 2006-12-16 13:04:55 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
changed exceptions being thrown on unsupported methods
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java
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-16 21:04:02 UTC (rev 249)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZParseFactory.java 2006-12-16 21:04:55 UTC (rev 250)
@@ -63,14 +63,14 @@
* Not supported at this time.
*/
public PZParser newFixedLengthParser(final Connection con, final File dataSource, final String dataDefinition) {
- throw new RuntimeException("Not supported...");
+ throw new UnsupportedOperationException("Not supported...");
}
/**
* Not supported at this time.
*/
public PZParser newFixedLengthParser(final Connection con, final InputStream dataSourceStream, final String dataDefinition) {
- throw new RuntimeException("Not supported...");
+ throw new UnsupportedOperationException("Not supported...");
}
/*
@@ -98,7 +98,7 @@
*/
public PZParser newDelimitedParser(final Connection con, final InputStream dataSourceStream, final String dataDefinition,
final char delimiter, final char qualifier, final boolean ignoreFirstRecord) {
- throw new RuntimeException("Not supported...");
+ throw new UnsupportedOperationException("Not supported...");
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:04:04
|
Revision: 249
http://svn.sourceforge.net/pzfilereader/?rev=249&view=rev
Author: benoitx
Date: 2006-12-16 13:04:02 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
quick checkstyle.
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-16 21:02:26 UTC (rev 248)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java 2006-12-16 21:04:02 UTC (rev 249)
@@ -73,11 +73,9 @@
try {
final String[] columnNames = ds.getColumns();
- final List exportOnlyColumnsList = exportOnlyColumns != null ?
- Arrays.asList(exportOnlyColumns) : null;
+ final List exportOnlyColumnsList = exportOnlyColumns != null ? Arrays.asList(exportOnlyColumns) : null;
- final List excludeFromExportColumnsList = excludeFromExportColumns != null ?
- Arrays.asList(excludeFromExportColumns) : 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:02:25
|
Revision: 248
http://svn.sourceforge.net/pzfilereader/?rev=248&view=rev
Author: benoitx
Date: 2006-12-16 13:02:26 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
checkstyle
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 21:01:40 UTC (rev 247)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 21:02:26 UTC (rev 248)
@@ -39,11 +39,11 @@
* @version 2.0
*/
public class DataError {
- final private String errorDesc;
+ private final String errorDesc;
- final private int lineNo;
+ private final int lineNo;
- final private int errorLevel;
+ private final int errorLevel;
/**
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:01:40
|
Revision: 247
http://svn.sourceforge.net/pzfilereader/?rev=247&view=rev
Author: benoitx
Date: 2006-12-16 13:01:40 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
checkstyle
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
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 21:01:13 UTC (rev 246)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 21:01:40 UTC (rev 247)
@@ -39,7 +39,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
import java.sql.Connection;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:01:13
|
Revision: 246
http://svn.sourceforge.net/pzfilereader/?rev=246&view=rev
Author: benoitx
Date: 2006-12-16 13:01:13 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
checkstyle
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 21:00:38 UTC (rev 245)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 21:01:13 UTC (rev 246)
@@ -44,7 +44,7 @@
private final BuffReaderFixedPZParser brFixedPzParser;
- public BuffReaderPZDataSet(final Map columnMD2, BuffReaderDelimPZParser brDelimPzParser) {
+ public BuffReaderPZDataSet(final Map columnMD2, final BuffReaderDelimPZParser brDelimPzParser) {
super(columnMD2);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
@@ -52,7 +52,7 @@
this.brFixedPzParser = null;
}
- public BuffReaderPZDataSet(final Map columnMD2, BuffReaderFixedPZParser brFixedPzParser) {
+ public BuffReaderPZDataSet(final Map columnMD2, final BuffReaderFixedPZParser brFixedPzParser) {
super(columnMD2);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
@@ -93,7 +93,7 @@
return true;
- } catch(IOException ex) {
+ } catch(final IOException ex) {
//TODO real logging here
ex.printStackTrace();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 21:00:37
|
Revision: 245
http://svn.sourceforge.net/pzfilereader/?rev=245&view=rev
Author: benoitx
Date: 2006-12-16 13:00:38 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
quick checkstyle...
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 19:44:51 UTC (rev 244)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2006-12-16 21:00:38 UTC (rev 245)
@@ -34,14 +34,11 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.DefaultDataSet;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 20:38:04
|
Revision: 244
http://svn.sourceforge.net/pzfilereader/?rev=244&view=rev
Author: benoitx
Date: 2006-12-16 11:44:51 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
removed the linkcheck report as it is unbearingly big...
Modified Paths:
--------------
trunk/project.xml
Modified: trunk/project.xml
===================================================================
--- trunk/project.xml 2006-12-16 19:08:17 UTC (rev 243)
+++ trunk/project.xml 2006-12-16 19:44:51 UTC (rev 244)
@@ -41,6 +41,6 @@
<report>maven-changelog-plugin</report>
<report>maven-developer-activity-plugin</report>
<report>maven-file-activity-plugin</report>
- <report>maven-linkcheck-plugin</report>
+ <!--<report>maven-linkcheck-plugin</report>-->
</reports>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-16 19:08:16
|
Revision: 243
http://svn.sourceforge.net/pzfilereader/?rev=243&view=rev
Author: zepernick
Date: 2006-12-16 11:08:17 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
added code to show errors in the file
Modified Paths:
--------------
trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java
Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java
===================================================================
--- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-12-16 19:07:48 UTC (rev 242)
+++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java 2006-12-16 19:08:17 UTC (rev 243)
@@ -6,7 +6,9 @@
*/
import java.io.File;
+import java.util.Iterator;
+import net.sf.pzfilereader.DataError;
import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.DefaultPZParserFactory;
import net.sf.pzfilereader.DataSet;
@@ -80,7 +82,13 @@
}
if (ds.getErrors() != null && ds.getErrors().size() > 0) {
- System.out.println("FOUND ERRORS IN FILE");
+ System.out.println("<<<<FOUND ERRORS IN FILE>>>>");
+ final Iterator pzerrors = ds.getErrors().iterator();
+ while (pzerrors.hasNext()) {
+ final DataError error = (DataError)pzerrors.next();
+ System.out.println("Error Msg: " + error.getErrorDesc() + " line no: " + error.getLineNo());
+ }
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zep...@us...> - 2006-12-16 19:07:48
|
Revision: 242
http://svn.sourceforge.net/pzfilereader/?rev=242&view=rev
Author: zepernick
Date: 2006-12-16 11:07:48 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
simian fixes
Modified Paths:
--------------
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/util/ParserUtils.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2006-12-16 18:07:39 UTC (rev 241)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2006-12-16 19:07:48 UTC (rev 242)
@@ -35,13 +35,9 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
-import net.sf.pzfilereader.structure.ColumnMetaData;
import net.sf.pzfilereader.util.PZConstants;
import net.sf.pzfilereader.util.ParserUtils;
@@ -60,45 +56,14 @@
}
protected void init() {
- ResultSet rs = null;
- PreparedStatement stmt = null;
-
try {
- final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON "
- + "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();
-
- int recPosition = 1;
- final List cmds = new ArrayList();
- // put array of columns together. These will be used to put together
- // the dataset when reading in the file
- while (rs.next()) {
-
- final ColumnMetaData column = new ColumnMetaData();
- column.setColName(rs.getString("DATASTRUCTURE_COLUMN"));
- column.setColLength(rs.getInt("DATASTRUCTURE_LENGTH"));
- column.setStartPosition(recPosition);
- column.setEndPosition(recPosition + (rs.getInt("DATASTRUCTURE_LENGTH") - 1));
- recPosition += rs.getInt("DATASTRUCTURE_LENGTH");
-
- cmds.add(column);
- }
-
+ final List cmds = ParserUtils.buildMDFromSQLTable(con, getDataDefinition());
addToColumnMD(PZConstants.DETAIL_ID, cmds);
addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds));
if (cmds.isEmpty()) {
throw new FileNotFoundException("DATA DEFINITION CAN NOT BE FOUND IN THE DATABASE " + getDataDefinition());
}
-
- // read in the fixed length file and construct the DataSet object
- // doFixedLengthFile(dataSourceStream);
setInitialised(true);
} catch (final SQLException e) {
// TODO Auto-generated catch block
@@ -106,19 +71,7 @@
} catch (final FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } finally {
- try {
- if (rs != null) {
- rs.close();
- }
- if (stmt != null) {
- stmt.close();
- }
- } catch (final SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
+ }
}
protected boolean shouldCreateMDFromFile() {
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-12-16 18:07:39 UTC (rev 241)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-12-16 19:07:48 UTC (rev 242)
@@ -36,13 +36,9 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
-import net.sf.pzfilereader.structure.ColumnMetaData;
import net.sf.pzfilereader.util.PZConstants;
import net.sf.pzfilereader.util.ParserUtils;
@@ -65,36 +61,9 @@
}
protected void init() {
- ResultSet rs = null;
- PreparedStatement stmt = null;
-
try {
- final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON "
- + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO "
- + "WHERE DATAFILE.DATAFILE_DESC = ? "
- + "ORDER BY DATASTRUCTURE_COL_ORDER";
+ final List cmds = ParserUtils.buildMDFromSQLTable(con, getDataDefinition());
- stmt = con.prepareStatement(sql); // always use PreparedStatement
- // as the DB can do clever things.
- stmt.setString(1, getDataDefinition());
- rs = stmt.executeQuery();
-
- int recPosition = 1;
- final List cmds = new ArrayList();
- // put array of columns together. These will be used to put together
- // the dataset when reading in the file
- while (rs.next()) {
-
- final ColumnMetaData column = new ColumnMetaData();
- column.setColName(rs.getString("DATASTRUCTURE_COLUMN"));
- column.setColLength(rs.getInt("DATASTRUCTURE_LENGTH"));
- column.setStartPosition(recPosition);
- column.setEndPosition(recPosition + (rs.getInt("DATASTRUCTURE_LENGTH") - 1));
- recPosition += rs.getInt("DATASTRUCTURE_LENGTH");
-
- cmds.add(column);
- }
-
addToColumnMD(PZConstants.DETAIL_ID, cmds);
addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds));
@@ -102,8 +71,6 @@
throw new FileNotFoundException("DATA DEFINITION CAN NOT BE FOUND IN THE DATABASE " + getDataDefinition());
}
- // read in the fixed length file and construct the DataSet object
- // doFixedLengthFile(dataSourceStream);
setInitialised(true);
} catch (final SQLException e) {
// TODO Auto-generated catch block
@@ -111,19 +78,7 @@
} catch (final FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } finally {
- try {
- if (rs != null) {
- rs.close();
- }
- if (stmt != null) {
- stmt.close();
- }
- } catch (final SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
+ }
}
public DataSet doParse() {
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 18:07:39 UTC (rev 241)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 19:07:48 UTC (rev 242)
@@ -42,6 +42,10 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -330,63 +334,7 @@
return s.toString();
}
- /**
- * Returns a list of ColumnMetaData objects. This is for use with delimited
- * files. The first line of the file which contains data will be used as the
- * column names
- *
- * @param theStream
- * @param delimiter
- * @param qualifier
- * @exception Exception
- * @return Map - ColumnMetaData
- * @deprecated see getColumMDFromFile(String, String, String)
- */
- public static Map getColumnMDFromFile(final InputStream theStream, final String delimiter, final String qualifier)
- throws Exception {
- InputStreamReader isr = null;
- BufferedReader br = null;
- // FileReader fr = null;
- String line = null;
- List lineData = null;
- final List results = new ArrayList();
- final Map columnMD = new LinkedHashMap();
- try {
- isr = new InputStreamReader(theStream);
- br = new BufferedReader(isr);
-
- while ((line = br.readLine()) != null) {
- if (line.trim().length() == 0) {
- continue;
- }
-
- lineData = splitLine(line, delimiter.charAt(0), qualifier.charAt(0), PZConstants.SPLITLINE_SIZE_INIT);
- for (int i = 0; i < lineData.size(); i++) {
- final ColumnMetaData cmd = new ColumnMetaData();
- cmd.setColName((String) lineData.get(i));
- results.add(cmd);
- }
- break;
- }
- } finally {
- if (lineData != null) {
- lineData.clear();
- }
- if (br != null) {
- br.close();
- }
- if (isr != null) {
- isr.close();
- }
- }
-
- columnMD.put(PZConstants.DETAIL_ID, results);
- columnMD.put(PZConstants.COL_IDX, buidColumnIndexMap(results));
-
- return columnMD;
- }
-
/**
* Returns a list of ColumnMetaData objects. This is for use with delimited
* files. The first line of the file which contains data will be used as the
@@ -593,7 +541,7 @@
while (columnMDIt.hasNext()) {
final Entry entry = (Entry) columnMDIt.next();
if (entry.getKey().equals(PZConstants.DETAIL_ID) || entry.getKey().equals(PZConstants.COL_IDX)) {
- cmds = (List) entry.getValue();
+ cmds = (List) columnMD.get(PZConstants.DETAIL_ID);
} else {
cmds = ((XMLRecordElement) entry.getValue()).getColumns();
}
@@ -920,6 +868,58 @@
}
}
+ /**
+ * Returns a definition of pz column metadata from a given
+ * pz datastructure held in an SQL database
+ *
+ * @param con
+ * Database connection containing the Datafile and Datastructure
+ * tables
+ * @param dataDefinition
+ * Name of the data definition stored in the Datafile table
+ * @return List
+ */
+ public static List buildMDFromSQLTable(final Connection con, final String dataDefinition) throws SQLException{
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
+ final List cmds = new ArrayList();
+ try {
+ final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON "
+ + "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, dataDefinition);
+ rs = stmt.executeQuery();
+
+ int recPosition = 1;
+ // put array of columns together. These will be used to put together
+ // the dataset when reading in the file
+ while (rs.next()) {
+
+ final ColumnMetaData column = new ColumnMetaData();
+ column.setColName(rs.getString("DATASTRUCTURE_COLUMN"));
+ column.setColLength(rs.getInt("DATASTRUCTURE_LENGTH"));
+ column.setStartPosition(recPosition);
+ column.setEndPosition(recPosition + (rs.getInt("DATASTRUCTURE_LENGTH") - 1));
+ recPosition += rs.getInt("DATASTRUCTURE_LENGTH");
+
+ cmds.add(column);
+ }
+ } finally {
+ if (rs != null) {
+ rs.close();
+ }
+ if (stmt != null) {
+ stmt.close();
+ }
+ }
+
+ return cmds;
+ }
+
//LEAVE AS A REFERENCE FOR POSSIBLE LATER USE
/* public static List splitLineWithBuf(String line, final char delimiter, char qualifier, int initialSize) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-12-16 18:07:39
|
Revision: 241
http://svn.sourceforge.net/pzfilereader/?rev=241&view=rev
Author: benoitx
Date: 2006-12-16 10:07:39 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
typos
Modified Paths:
--------------
trunk/src/site/changes.xml
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2006-12-16 18:04:03 UTC (rev 240)
+++ trunk/src/site/changes.xml 2006-12-16 18:07:39 UTC (rev 241)
@@ -9,14 +9,14 @@
<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>
+ was deprecated 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>
+ <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>
- <action dev="zepernick" type="add">Ability to issue an OrderBy On DataSet's containing record mapping elements</action>
+ <action dev="zepernick" type="add">Unqualified elements have leading and trailing whitespace removed in a delimited parse</action>
+ <action dev="zepernick" type="add">Ability to issue an OrderBy On DataSet's containing record mapping elements</action>
<action dev="benoitx" type="add">Move build to Maven 1.1.x and generate the entire website from the build.</action>
<action dev="benoitx" type="fix">Modify code following warning by Findbugs, checkstyle and PMD.</action>
<action dev="marchy" type="add">Move to Subversion.</action>
@@ -79,7 +79,7 @@
http://sourceforge.net/projects/jexcelapi. The jxl.jar has been included in the download for your convience and must be on the classpath if using this
new method --> writeToExcel(File) in the DataSet class
</action>
- <action dev="zepernick" type="add">Changed examples to work with 2.1.0. Some examples still refered to depricated constructors from 2.0.0 which have
+ <action dev="zepernick" type="add">Changed examples to work with 2.1.0. Some examples still refered to deprecated constructors from 2.0.0 which have
been removed in this version.
</action>
<action dev="zepernick" type="add">Added 2 new examples to demonstrate the export to Excel and the parsing of multiline records.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
