[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/flat DelimitedFlatFileReader.java, 1.5, 1.6 DelimitedFlatFileWriter.java, 1.4, 1.5 FixedWidthFlatFileFieldSpec.java, 1.4, 1.5 FixedWidthFlatFileReader.java, 1.8, 1.9 FixedWidthFlatFileWriter.java, 1.9, 1.10 FlatFileReader.java, 1.3, 1.4 sample-fixed-width-file-spec.xml, 1.3, 1.4

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26950/flat

Modified Files:
	DelimitedFlatFileReader.java DelimitedFlatFileWriter.java 
	FixedWidthFlatFileFieldSpec.java FixedWidthFlatFileReader.java 
	FixedWidthFlatFileWriter.java FlatFileReader.java 
	sample-fixed-width-file-spec.xml 
Log Message:
no message

Index: DelimitedFlatFileWriter.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DelimitedFlatFileWriter.java	13 Jun 2006 22:10:08 -0000	1.4
--- DelimitedFlatFileWriter.java	21 Jun 2006 22:02:29 -0000	1.5
***************
*** 50,54 ****
      {
          super(outputStream,fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0);        
      }
  
--- 50,54 ----
      {
          super(outputStream,fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().iterator().next();
      }
  
***************
*** 63,67 ****
      {
          super(writer,fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0);        
      }
      
--- 63,67 ----
      {
          super(writer,fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().iterator().next();
      }
      

Index: FixedWidthFlatFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FixedWidthFlatFileReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FixedWidthFlatFileReader.java	13 Jun 2006 22:10:08 -0000	1.8
--- FixedWidthFlatFileReader.java	21 Jun 2006 22:02:29 -0000	1.9
***************
*** 12,15 ****
--- 12,16 ----
  import java.io.InputStream;
  import java.io.Reader;
+ import java.util.Collection;
  import java.util.Iterator;
  import java.util.List;
***************
*** 70,75 ****
          logger.trace("Entering parseRecord");
          FlatFileReaderRecord record=null;
!         List recordSpecList=this.fileSpec.getRecordSpecs();
!         for(Iterator recordSpecIterator=recordSpecList.iterator();recordSpecIterator.hasNext();)
          {
              FixedWidthFlatFileRecordSpec recordSpec=(FixedWidthFlatFileRecordSpec)recordSpecIterator.next();
--- 71,76 ----
          logger.trace("Entering parseRecord");
          FlatFileReaderRecord record=null;
!         Collection recordSpecCollection=this.fileSpec.getRecordSpecs();
!         for(Iterator recordSpecIterator=recordSpecCollection.iterator();recordSpecIterator.hasNext();)
          {
              FixedWidthFlatFileRecordSpec recordSpec=(FixedWidthFlatFileRecordSpec)recordSpecIterator.next();
***************
*** 84,88 ****
                      try
                      {
!                         fieldValue=recordString.substring(fieldSpec.getStartPosition(),fieldSpec.getEndPosition());
                      }
                      catch(IndexOutOfBoundsException exception)
--- 85,89 ----
                      try
                      {
!                         fieldValue=recordString.substring(fieldSpec.getStartPosition()-1,fieldSpec.getEndPosition());
                      }
                      catch(IndexOutOfBoundsException exception)

Index: FixedWidthFlatFileFieldSpec.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FixedWidthFlatFileFieldSpec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FixedWidthFlatFileFieldSpec.java	10 Jun 2006 17:51:37 -0000	1.4
--- FixedWidthFlatFileFieldSpec.java	21 Jun 2006 22:02:29 -0000	1.5
***************
*** 117,121 ****
          String endPosition=fieldSpecElement.getAttribute(FixedWidthFlatFileFieldSpec.END_POSITION_ATTRIB_NAME);
          if(endPosition!=null && !"".equals(endPosition.trim()))
!             fieldSpec.startPosition=Integer.parseInt(endPosition);
          else
              throw new FileSpecException("end-pos attribute is required in fixed width flat file spec element.");
--- 117,121 ----
          String endPosition=fieldSpecElement.getAttribute(FixedWidthFlatFileFieldSpec.END_POSITION_ATTRIB_NAME);
          if(endPosition!=null && !"".equals(endPosition.trim()))
!             fieldSpec.endPosition=Integer.parseInt(endPosition);
          else
              throw new FileSpecException("end-pos attribute is required in fixed width flat file spec element.");

Index: sample-fixed-width-file-spec.xml
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/sample-fixed-width-file-spec.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sample-fixed-width-file-spec.xml	15 Jun 2006 18:57:02 -0000	1.3
--- sample-fixed-width-file-spec.xml	21 Jun 2006 22:02:29 -0000	1.4
***************
*** 11,15 ****
          <field-spec field-name="field4" start-pos="32" end-pos="41"/>
      </record-spec>    
!     <record-spec record-type="trailor" starts-with="6" record-length="9"> 
          <field-spec field-name="recordCount" start-pos="2" end-pos="9"/>
      </record-spec>
--- 11,15 ----
          <field-spec field-name="field4" start-pos="32" end-pos="41"/>
      </record-spec>    
!     <record-spec record-type="trailer" starts-with="6" record-length="9"> 
          <field-spec field-name="recordCount" start-pos="2" end-pos="9"/>
      </record-spec>

Index: FixedWidthFlatFileWriter.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FixedWidthFlatFileWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FixedWidthFlatFileWriter.java	15 Jun 2006 18:57:02 -0000	1.9
--- FixedWidthFlatFileWriter.java	21 Jun 2006 22:02:29 -0000	1.10
***************
*** 81,87 ****
          {
              FixedWidthFlatFileFieldSpec fieldSpec=(FixedWidthFlatFileFieldSpec)iterator.next();
!             char[] fieldValue=((String)record.readField(fieldSpec.getFieldName())).toCharArray();
!             System.arraycopy(fieldValue, 0, recordBuffer, fieldSpec.getStartPosition()-1, 
!                     ((fieldValue.length>fieldSpec.getFieldWidth())?fieldSpec.getFieldWidth():fieldValue.length));
          }
          logger.trace("Exiting generateRecord");
--- 81,91 ----
          {
              FixedWidthFlatFileFieldSpec fieldSpec=(FixedWidthFlatFileFieldSpec)iterator.next();
!             String fieldValue=(String)record.readField(fieldSpec.getFieldName());
!             if(fieldValue!=null)
!             {
!                 char[] fieldValueChars=fieldValue.toCharArray();
!                 System.arraycopy(fieldValueChars, 0, recordBuffer, fieldSpec.getStartPosition()-1, 
!                         ((fieldValueChars.length>fieldSpec.getFieldWidth())?fieldSpec.getFieldWidth():fieldValueChars.length));                
!             }
          }
          logger.trace("Exiting generateRecord");

Index: DelimitedFlatFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DelimitedFlatFileReader.java	15 Jun 2006 18:57:02 -0000	1.5
--- DelimitedFlatFileReader.java	21 Jun 2006 22:02:29 -0000	1.6
***************
*** 52,56 ****
      {
          super(fileInputStream, fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0);
      }
  
--- 52,56 ----
      {
          super(fileInputStream, fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().iterator().next();
      }
  
***************
*** 65,69 ****
      {
          super(reader, fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0);
      }
      
--- 65,69 ----
      {
          super(reader, fileSpec);
!         recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().iterator().next();
      }
      

Index: FlatFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FlatFileReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FlatFileReader.java	13 Jun 2006 22:10:08 -0000	1.3
--- FlatFileReader.java	21 Jun 2006 22:02:29 -0000	1.4
***************
*** 68,72 ****
          logger.trace("Entering FlatFileReader constructor");
          this.fileSpec=fileSpec;
!         reader=new BufferedReader(reader);        
          logger.info("Done creating the flat file reader.");
      }
--- 68,72 ----
          logger.trace("Entering FlatFileReader constructor");
          this.fileSpec=fileSpec;
!         this.reader=new BufferedReader(reader);        
          logger.info("Done creating the flat file reader.");
      }