[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/flat DelimitedFlatFileReader.java, 1.7, 1.8

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

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

Modified Files:
	DelimitedFlatFileReader.java 
Log Message:
no message

Index: DelimitedFlatFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DelimitedFlatFileReader.java	22 Jun 2006 22:52:01 -0000	1.7
--- DelimitedFlatFileReader.java	23 Jun 2006 16:45:50 -0000	1.8
***************
*** 15,18 ****
--- 15,19 ----
  import java.util.Iterator;
  import java.util.List;
+ import java.util.StringTokenizer;
  import org.apache.log4j.Logger;
  import org.jmonks.batchserver.io.FileParseException;
***************
*** 78,85 ****
          logger.trace("Entering parseRecord");
          FlatFileReaderRecord record=null;
!         String[] fieldValuesArray=recordString.split(recordSpec.getDelimiter());
!         if(fieldValuesArray.length!=recordSpec.getFieldCount())
              throw new FileParseException("Record " + recordString + " doesnt have " + recordSpec.getFieldCount() + " fields.");
!         
          List fieldSpecList=recordSpec.getFieldSpecs();
          record=new FlatFileReaderRecord(recordSpec.getRecordType(),fieldSpecList.size());
--- 79,98 ----
          logger.trace("Entering parseRecord");
          FlatFileReaderRecord record=null;
!         StringTokenizer tokenizer=new StringTokenizer(recordString,recordSpec.getDelimiter());
!         int totalTokensAvailable=tokenizer.countTokens();
!         if(totalTokensAvailable!=recordSpec.getFieldCount())
              throw new FileParseException("Record " + recordString + " doesnt have " + recordSpec.getFieldCount() + " fields.");
!         /**
!          *  Populate all the tokens into the array.
!          */
!         String[] fieldValuesArray=new String[totalTokensAvailable];
!         int i=0;
!         while(tokenizer.hasMoreTokens())
!         {
!             fieldValuesArray[i++]=tokenizer.nextToken();
!         }
!         /**
!          *  Go through the each field spec and populate the values in the record.
!          */
          List fieldSpecList=recordSpec.getFieldSpecs();
          record=new FlatFileReaderRecord(recordSpec.getRecordType(),fieldSpecList.size());
***************
*** 95,99 ****
          }
          logger.trace("Exiting parseRecord");
!         return record;
      }
  }
--- 108,112 ----
          }
          logger.trace("Exiting parseRecord");
!         return record;        
      }
  }