Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv31614/digester
Modified Files:
DigesterConversionUnmarshaller.java InputDocument.java
LineSegment.java
Log Message:
Added fixes for bugs: 865405, 865397
and RFE: 865418
Index: DigesterConversionUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/DigesterConversionUnmarshaller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DigesterConversionUnmarshaller.java 16 Sep 2003 05:19:00 -0000 1.3
--- DigesterConversionUnmarshaller.java 24 Dec 2003 20:14:15 -0000 1.4
***************
*** 459,462 ****
--- 459,464 ----
digester.addCallMethod("conversion/line-segments/segment/end-group-name",
"setEndGroupName", 0);
+ digester.addCallMethod("conversion/line-segments/segment/segment-pattern",
+ "setSegmentPattern", 0);
// Handle line segment - line fields
Index: InputDocument.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/InputDocument.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InputDocument.java 30 Oct 2003 00:15:56 -0000 1.2
--- InputDocument.java 24 Dec 2003 20:14:15 -0000 1.3
***************
*** 108,113 ****
*/
public void setFieldSeparator(String fieldSeparator) {
! // System.out.println("[InputDocument.setFieldSeparator]: "+fieldSeparator);
! this.fieldSeparator = fieldSeparator;
}
--- 108,118 ----
*/
public void setFieldSeparator(String fieldSeparator) {
! // System.out.println ("[InputDocument.setFieldSeparator]:
! // "+fieldSeparator);
! if (fieldSeparator.equals("\\t")) {
! this.fieldSeparator = "\t";
! } else {
! this.fieldSeparator = fieldSeparator;
! }
}
Index: LineSegment.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/LineSegment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LineSegment.java 30 Oct 2003 00:15:56 -0000 1.2
--- LineSegment.java 24 Dec 2003 20:14:15 -0000 1.3
***************
*** 82,90 ****
private String beginGroupName;
private String endGroupName;
! private String segmentColumn;
private String segmentName;
! private String segmentValue;
! private String segmentWidth;
!
/**
* setBeginGroupName
--- 82,90 ----
private String beginGroupName;
private String endGroupName;
! private String segmentColumn = "0";
private String segmentName;
! private String segmentValue = "";
! private String segmentWidth = "0";
! private String segmentPattern;
/**
* setBeginGroupName
***************
*** 250,253 ****
--- 250,261 ----
// System.out.println("[LineSegment.addLineField]");
this.lineFields.add(lineField);
+ }
+
+ public String getSegmentPattern() {
+ return segmentPattern;
+ }
+
+ public void setSegmentPattern(String segmentPattern) {
+ this.segmentPattern = segmentPattern;
}
}
|