[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/flat DelimitedFlatFileReader.java, 1.2, 1.3 DelimitedFlatFileRecordSpec.java, 1.1, 1.2 DelimitedFlatFileWriter.java, 1.2, 1.3

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

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

Modified Files:
	DelimitedFlatFileReader.java DelimitedFlatFileRecordSpec.java 
	DelimitedFlatFileWriter.java 
Log Message:
no message

Index: DelimitedFlatFileRecordSpec.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileRecordSpec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelimitedFlatFileRecordSpec.java	10 Jun 2006 17:51:37 -0000	1.1
--- DelimitedFlatFileRecordSpec.java	12 Jun 2006 20:58:51 -0000	1.2
***************
*** 48,51 ****
--- 48,55 ----
      private String delimiter=null;
      /**
+      *  Represents the number of fields available in the record.
+      */
+     private int fieldCount;
+     /**
       *  Constant defines the delimiter attribute name which the value is "delimiter"
       */
***************
*** 69,72 ****
--- 73,84 ----
          return this.delimiter;
      }
+ 
+     /**
+      *  Returns the number of fields exists in this record.
+      */
+     public int getFieldCount()
+     {
+         return this.fieldCount;
+     }
      
      /**
***************
*** 103,106 ****
--- 115,119 ----
              throw new FileSpecException("Record Spec in Delimited File Spec should have delimiter attribute.");
  
+         recordSpec.fieldCount=1;
          NodeList fieldSpecNodeList=recordSpecElement.getElementsByTagName(FieldSpec.FIELD_SPEC_TAG_NAME);
          for(int i=0;i<fieldSpecNodeList.getLength();i++)
***************
*** 116,119 ****
--- 129,134 ----
              }
              recordSpec.addFieldSpec(fieldSpec);
+             if(fieldSpec.getIndex()>recordSpec.fieldCount)
+                 recordSpec.fieldCount=fieldSpec.getIndex();
          }
          return recordSpec;

Index: DelimitedFlatFileWriter.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelimitedFlatFileWriter.java	12 Jun 2006 13:15:37 -0000	1.2
--- DelimitedFlatFileWriter.java	12 Jun 2006 20:58:51 -0000	1.3
***************
*** 34,40 ****
  {
      private static Logger logger=Logger.getLogger(DelimitedFlatFileWriter.class);
! 
      private DelimitedFlatFileRecordSpec recordSpec=null;
!     
      public DelimitedFlatFileWriter(OutputStream outputStream,FileSpec fileSpec)
      {
--- 34,49 ----
  {
      private static Logger logger=Logger.getLogger(DelimitedFlatFileWriter.class);
!     /**
!      *  Holds the single record spec exists in Delimited file spec.
!      */
      private DelimitedFlatFileRecordSpec recordSpec=null;
! 
!     /**
!      *  Constructs the Delimited flat file writer from the given output stream
!      *  and file spec.
!      *
!      *  @param  fileOutputStream Output stream representing the file to generate.
!      *  @param  fileSpec    File spec of the delimited flat to be generated.
!      */    
      public DelimitedFlatFileWriter(OutputStream outputStream,FileSpec fileSpec)
      {
***************
*** 43,51 ****
      }
  
      protected String generateRecord(WriterRecord writerRecord) throws java.io.IOException
      {
          FlatFileWriterRecord flatFileWriterRecord=(FlatFileWriterRecord)writerRecord;
          
!         String[] fieldValuesArray=new String[10];
          for(Iterator iterator=recordSpec.getFieldSpecs().iterator();iterator.hasNext();)
          {
--- 52,67 ----
      }
  
+     /**
+      *  Generates the string represenatation of the record from the writer record given by client.
+      *
+      *  @param  writerRecord    Writer record consists of field names and values.
+      *
+      *  @return Returns the string representation of the record.
+      */
      protected String generateRecord(WriterRecord writerRecord) throws java.io.IOException
      {
          FlatFileWriterRecord flatFileWriterRecord=(FlatFileWriterRecord)writerRecord;
          
!         String[] fieldValuesArray=new String[recordSpec.getFieldCount()];
          for(Iterator iterator=recordSpec.getFieldSpecs().iterator();iterator.hasNext();)
          {

Index: DelimitedFlatFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelimitedFlatFileReader.java	12 Jun 2006 13:15:37 -0000	1.2
--- DelimitedFlatFileReader.java	12 Jun 2006 20:58:51 -0000	1.3
***************
*** 36,42 ****
  {
      private static Logger logger=Logger.getLogger(DelimitedFlatFileReader.class);
!     
      private DelimitedFlatFileRecordSpec recordSpec=null;
!     
      public DelimitedFlatFileReader(InputStream fileInputStream,FileSpec fileSpec)
      {
--- 36,51 ----
  {
      private static Logger logger=Logger.getLogger(DelimitedFlatFileReader.class);
!     /**
!      *  Holds the single record spec exists in Delimited file spec.
!      */
      private DelimitedFlatFileRecordSpec recordSpec=null;
! 
!     /**
!      *  Constructs the Delimited flat file reader from the given input stream
!      *  and file spec.
!      *
!      *  @param  fileInputStream Input stream representing the file to parse.
!      *  @param  fileSpec    File spec of the delimited flat to be read.
!      */
      public DelimitedFlatFileReader(InputStream fileInputStream,FileSpec fileSpec)
      {
***************
*** 45,48 ****
--- 54,63 ----
      }
  
+     /**
+      *  Parses the given record string where fields are delimited by a special character
+      *  and returns the reader record.
+      *
+      *  @param  recordString    Record consists of fields delimited by special character.
+      */
      protected ReaderRecord parseRecord(String recordString)
      {