[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io FileReader.java, 1.10, 1.11 FileSpec.ja
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io FileReader.java, 1.10, 1.11 FileSpec.java, 1.9, 1.10 FileWriter.java, 1.5, 1.6 RecordType.java, 1.5, 1.6
|
From: Suresh <sur...@us...> - 2006-06-10 17:50:30
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19944 Modified Files: FileReader.java FileSpec.java FileWriter.java RecordType.java Log Message: no message Index: FileWriter.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/FileWriter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileWriter.java 9 Jun 2006 21:36:34 -0000 1.5 --- FileWriter.java 10 Jun 2006 17:50:24 -0000 1.6 *************** *** 13,16 **** --- 13,17 ---- import java.io.OutputStream; import org.apache.log4j.Logger; + import org.jmonks.batchserver.io.flat.DelimitedFlatFileWriter; import org.jmonks.batchserver.io.flat.FixedWidthFlatFileWriter; import org.jmonks.batchserver.io.xml.XMLFileWriter; *************** *** 99,103 **** return new FixedWidthFlatFileWriter(outputStream,fileSpec); else if(fileSpec.getFileType()==FileType.DELIMITED_FLAT_FILE) ! return null; // Create Demlited Flat file reader. else if(fileSpec.getFileType()==FileType.XML_FILE) return new XMLFileWriter(outputStream,fileSpec); --- 100,104 ---- return new FixedWidthFlatFileWriter(outputStream,fileSpec); else if(fileSpec.getFileType()==FileType.DELIMITED_FLAT_FILE) ! return new DelimitedFlatFileWriter(outputStream, fileSpec); else if(fileSpec.getFileType()==FileType.XML_FILE) return new XMLFileWriter(outputStream,fileSpec); Index: FileReader.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/FileReader.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FileReader.java 9 Jun 2006 21:36:34 -0000 1.10 --- FileReader.java 10 Jun 2006 17:50:24 -0000 1.11 *************** *** 10,17 **** package org.jmonks.batchserver.io; - - import java.io.File; import java.io.InputStream; import org.apache.log4j.Logger; import org.jmonks.batchserver.io.xml.XMLFileReader; import org.jmonks.batchserver.io.flat.FixedWidthFlatFileReader; --- 10,16 ---- package org.jmonks.batchserver.io; import java.io.InputStream; import org.apache.log4j.Logger; + import org.jmonks.batchserver.io.flat.DelimitedFlatFileReader; import org.jmonks.batchserver.io.xml.XMLFileReader; import org.jmonks.batchserver.io.flat.FixedWidthFlatFileReader; *************** *** 98,102 **** return new FixedWidthFlatFileReader(fileInputStream,fileSpec); else if(fileSpec.getFileType()==FileType.DELIMITED_FLAT_FILE) ! return null; // Create Demlited Flat file reader. else if(fileSpec.getFileType()==FileType.XML_FILE) return new XMLFileReader(fileInputStream,fileSpec); --- 97,101 ---- return new FixedWidthFlatFileReader(fileInputStream,fileSpec); else if(fileSpec.getFileType()==FileType.DELIMITED_FLAT_FILE) ! return new DelimitedFlatFileReader(fileInputStream,fileSpec); else if(fileSpec.getFileType()==FileType.XML_FILE) return new XMLFileReader(fileInputStream,fileSpec); Index: FileSpec.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/FileSpec.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FileSpec.java 9 Jun 2006 21:36:34 -0000 1.9 --- FileSpec.java 10 Jun 2006 17:50:24 -0000 1.10 *************** *** 10,17 **** package org.jmonks.batchserver.io; - - import java.io.File; - import java.io.FileInputStream; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; --- 10,13 ---- *************** *** 23,26 **** --- 19,23 ---- import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.Logger; + import org.jmonks.batchserver.io.flat.DelimitedFlatFileFileSpec; import org.w3c.dom.Document; import org.w3c.dom.Element; *************** *** 197,201 **** return FixedWidthFlatFileFileSpec.createFixedWidthFlatFileFileSpec(fileSpecElement); else if(fileType==FileType.DELIMITED_FLAT_FILE) ! return null; //DelimitedFlatFileFileSpec.createDelimitedFlatFileFileSpec(fileSpecPath,fileSpecElement); else if(fileType==FileType.XML_FILE) return XMLFileSpec.createXMLFileSpec(fileSpecElement); --- 194,198 ---- return FixedWidthFlatFileFileSpec.createFixedWidthFlatFileFileSpec(fileSpecElement); else if(fileType==FileType.DELIMITED_FLAT_FILE) ! return DelimitedFlatFileFileSpec.createDelimitedFlatFileFileSpec(fileSpecElement); else if(fileType==FileType.XML_FILE) return XMLFileSpec.createXMLFileSpec(fileSpecElement); Index: RecordType.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/RecordType.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RecordType.java 8 Jun 2006 22:21:15 -0000 1.5 --- RecordType.java 10 Jun 2006 17:50:24 -0000 1.6 *************** *** 44,48 **** if(type!=null) { ! if("HEADER".equalsIgnoreCase(type) || "DETAIL".equalsIgnoreCase(type) || "TRAILOR".equalsIgnoreCase(type)) throw new IllegalArgumentException("Record type value " + type + " is in use."); else --- 44,49 ---- if(type!=null) { ! if("HEADER".equalsIgnoreCase(type) || "DETAIL".equalsIgnoreCase(type) || "TRAILOR".equalsIgnoreCase(type) ! || "BLOCK-START".equalsIgnoreCase(type) || "BLOCK-END".equalsIgnoreCase(type)) throw new IllegalArgumentException("Record type value " + type + " is in use."); else *************** *** 72,75 **** --- 73,80 ---- else if(RecordType.TRAILOR.equals(recordType)) return RecordType.TRAILOR; + else if(RecordType.BLOCK_START.equals(recordType)) + return RecordType.BLOCK_START; + else if(RecordType.BLOCK_END.equals(recordType)) + return RecordType.BLOCK_END; else return new RecordType(recordType); *************** *** 111,114 **** --- 116,124 ---- public static final RecordType HEADER = new RecordType("HEADER"); /** + * Represents the header record and the value to be used in the record + * spec is "TRAILOR". + */ + public static final RecordType TRAILOR = new RecordType("TRAILOR"); + /** * Represents the detailed record and the value to be used in the record * spec is "DETAIL". *************** *** 116,122 **** public static final RecordType DETAIL = new RecordType("DETAIL"); /** ! * Represents the header record and the value to be used in the record ! * spec is "TRAILOR". */ ! public static final RecordType TRAILOR = new RecordType("TRAILOR"); } --- 126,138 ---- public static final RecordType DETAIL = new RecordType("DETAIL"); /** ! * Represents the starting record of the block and the value to be used in the record ! * spec is "BLOCK-START". */ ! public static final RecordType BLOCK_START = new RecordType("BLOCK-START"); ! /** ! * Represents the ending record of the block and the value to be used in the record ! * spec is "BLOCK-END". ! */ ! public static final RecordType BLOCK_END = new RecordType("BLOCK-END"); ! } |
