[Pzfilereader-svn] SF.net SVN: pzfilereader: [302] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader

[<zep...@us...>]

Revision: 302
          http://svn.sourceforge.net/pzfilereader/?rev=302&view=rev
Author:   zepernick
Date:     2007-04-21 14:34:49 -0700 (Sat, 21 Apr 2007)

Log Message:
-----------
Added option to return empty Strings as null. Feature request 1569891.

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java	2007-04-21 16:44:58 UTC (rev 301)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java	2007-04-21 21:34:49 UTC (rev 302)
@@ -56,6 +56,8 @@
     private boolean initialised = false;
     
     private boolean ignoreParseWarnings = false;
+    
+    private boolean nullEmptyStrings = false;
 
     /** Map of column metadata's */
     private Map columnMD = null;
@@ -252,5 +254,13 @@
     public void setIgnoreParseWarnings(boolean ignoreParseWarnings) {
         this.ignoreParseWarnings = ignoreParseWarnings;        
     }
+    
+    public boolean isNullEmptyStrings() {
+        return nullEmptyStrings;
+    }
+    
+    public void setNullEmptyStrings(boolean nullEmptyStrings) {
+        this.nullEmptyStrings = nullEmptyStrings;        
+    }
 
 }

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java	2007-04-21 16:44:58 UTC (rev 301)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java	2007-04-21 21:34:49 UTC (rev 302)
@@ -261,7 +261,11 @@
     public String getString(final String column) {
         final Row row = (Row) rows.get(pointer);
         final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
-
+        
+        if (pzparser.isNullEmptyStrings() && s.trim().equals("")) {
+            return null;
+        }   
+        
         if (upperCase) {
             // convert data to uppercase before returning
             // return row.getValue(ParserUtils.findColumn(column,

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java	2007-04-21 16:44:58 UTC (rev 301)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java	2007-04-21 21:34:49 UTC (rev 302)
@@ -112,4 +112,16 @@
      *                            in the DataSet errors
      */
     void setIgnoreParseWarnings(final boolean ignoreParseWarnings);
+    
+    /**
+     * 
+     * @return true, empty Strings will get returned as NULL when calling DataSet.getString()
+     */
+    boolean isNullEmptyStrings();
+    
+    /**
+     * 
+     * @param nullEmptyStrings when true, empty Strings will get returned as NULL when calling DataSet.getString()
+     */
+    void setNullEmptyStrings(final boolean nullEmptyStrings);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.