Revision: 169
http://svn.sourceforge.net/pzfilereader/?rev=169&view=rev
Author: zepernick
Date: 2006-11-04 08:05:34 -0800 (Sat, 04 Nov 2006)
Log Message:
-----------
moved code from getInt and getDouble into ParserUtils. Called
methods from ParserUtils
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-11-04 16:04:24 UTC (rev 168)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-11-04 16:05:34 UTC (rev 169)
@@ -163,19 +163,7 @@
final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
if (!strictNumericParse) {
- if (s.trim().length() == 0) {
- return 0;
- }
- for (int i = 0; i < s.length(); i++) {
- final char c = s.charAt(i);
- if (c >= '0' && c <= '9' || c == '.' || c == '-') {
- newString.append(c);
- }
- }
- if (newString.length() == 0 || (newString.length() == 1 && newString.toString().equals("."))
- || (newString.length() == 1 && newString.toString().equals("-"))) {
- newString.append("0");
- }
+ newString.append(ParserUtils.stripNonDoubleChars(s));
} else {
newString.append(s);
}
@@ -225,20 +213,7 @@
final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
if (!strictNumericParse) {
- if (s.trim().length() == 0) {
- return 0;
- }
- for (int i = 0; i < s.length(); i++) {
- final char c = s.charAt(i);
- if (c >= '0' && c <= '9' || c == '-') {
- newString.append(c);
- }
- }
- // check to make sure we do not have a single length string with
- // just a minus sign
- if (newString.length() == 0 || (newString.length() == 1 && newString.toString().equals("-"))) {
- newString.append("0");
- }
+ newString.append(ParserUtils.stripNonLongChars(s));
} else {
newString.append(s);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|