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

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

Revision: 135
          http://svn.sourceforge.net/pzfilereader/?rev=135&view=rev
Author:   zepernick
Date:     2006-10-26 17:23:25 -0700 (Thu, 26 Oct 2006)

Log Message:
-----------
moved parse to FixedWidthParserUtils

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-10-27 00:22:50 UTC (rev 134)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java	2006-10-27 00:23:25 UTC (rev 135)
@@ -37,6 +37,7 @@
 import net.sf.pzfilereader.structure.ColumnMetaData;
 import net.sf.pzfilereader.structure.Row;
 import net.sf.pzfilereader.util.ExcelTransformer;
+import net.sf.pzfilereader.util.FixedWidthParserUtils;
 import net.sf.pzfilereader.util.PZConstants;
 import net.sf.pzfilereader.util.ParserUtils;
 import net.sf.pzfilereader.xml.PZMapParser;
@@ -653,7 +654,7 @@
                     continue;
                 }
 
-                final String mdkey = ParserUtils.getCMDKeyForFixedLengthFile(columnMD, line);
+                final String mdkey = FixedWidthParserUtils.getCMDKey(columnMD, line);
                 final int recordLength = ((Integer) recordLengths.get(mdkey)).intValue();
 
                 // Incorrect record length on line log the error. Line will not
@@ -676,19 +677,20 @@
                     }
                 }
 
-                int recPosition = 1;
+                //int recPosition = 1;
                 final Row row = new Row();
                 row.setMdkey(mdkey.equals(PZConstants.DETAIL_ID) ? null : mdkey); // try
 
                 final List cmds = ParserUtils.getColumnMetaData(mdkey, columnMD);
+                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());
-                }
+                //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
                 rows.add(row);


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