Skip to content

Commit

Permalink
Issue #106 StringTreeBuilder now has/uses a method to add a single line
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Harrah (frizbog) committed Jul 3, 2016
1 parent 587936a commit 2ed14d6
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 48 deletions.
10 changes: 5 additions & 5 deletions src/main/java/org/gedcom4j/parser/GedcomParser.java
View file
Expand Up @@ -339,8 +339,8 @@ StringTree readFile(String filename) throws IOException, GedcomParserException {
* @return true if and only if the Gedcom data says it is for the 5.5 standard.
*/
private boolean g55() {
return gedcom != null && gedcom.header != null && gedcom.header.gedcomVersion != null
&& SupportedVersion.V5_5.equals(gedcom.header.gedcomVersion.versionNumber);
return gedcom != null && gedcom.header != null && gedcom.header.gedcomVersion != null && SupportedVersion.V5_5.equals(
gedcom.header.gedcomVersion.versionNumber);
}

/**
Expand Down Expand Up @@ -1046,9 +1046,9 @@ private void loadFileReferences551(Multimedia m, List<StringTree> children) {
} else if (Tag.NOTE.equals(ch.tag)) {
loadNote(ch, m.notes);
if (!g55()) {
warnings.add(
"Gedcom version was 5.5.1, but a NOTE was found on a multimedia link on line " + ch.lineNum + ", which is no longer supported. "
+ "Data will be loaded, but cannot be written back out unless the GEDCOM version is changed to 5.5");
warnings.add("Gedcom version was 5.5.1, but a NOTE was found on a multimedia link on line " + ch.lineNum
+ ", which is no longer supported. "
+ "Data will be loaded, but cannot be written back out unless the GEDCOM version is changed to 5.5");
}
} else {
unknownTag(ch, m);
Expand Down
93 changes: 50 additions & 43 deletions src/main/java/org/gedcom4j/parser/StringTreeBuilder.java
View file
Expand Up @@ -80,6 +80,16 @@ static String leftTrim(String line) {
*/
private final GedcomParser parser;

/**
* The line number we're on - 1-based!!!!!!
*/
private int lineNum = 0;

/**
* The line we're currently processing
*/
private String line;

/**
* Constructor
*
Expand All @@ -92,6 +102,34 @@ static String leftTrim(String line) {
public StringTreeBuilder(GedcomParser parser, BufferedInputStream inputStream) {
this.parser = parser;
this.inputStream = inputStream;
treeForWholeFile.level = -1;
mostRecentlyAdded = null;
lineNum = 0; // Haven't read any lines yet
}

/**
* Add the supplied line to the right place in the StringTree being built
*
* @param l
* the line to add
*
* @throws GedcomParserException
* if there is an error with parsing the data from the stream
*/
void appendLine(String l) throws GedcomParserException {
line = l;
lineNum++;
treeForCurrentLine = new StringTree();
treeForCurrentLine.lineNum = lineNum;

checkIfNewLevelLine();

if (beginsWithLevelAndSpace) {
addNewNode();
mostRecentlyAdded = treeForCurrentLine;
} else {
makeConcatenationOfPreviousNode();
}
}

/**
Expand All @@ -110,21 +148,9 @@ StringTree makeStringTreeFromFlatLines(List<String> lines) throws IOException, G
treeForWholeFile.level = -1;
mostRecentlyAdded = null;
try {
for (int lineNum = 1; lineNum <= lines.size(); lineNum++) {
treeForCurrentLine = new StringTree();
treeForCurrentLine.lineNum = lineNum;

String line = lines.get(lineNum - 1);
line = leftTrim(line); // See issue 57

checkIfNewLevelLine(lineNum, line);

if (beginsWithLevelAndSpace) {
addNewNode(lineNum, line);
mostRecentlyAdded = treeForCurrentLine;
} else {
makeConcatenationOfPreviousNode(lineNum, line);
}
while (lineNum < lines.size()) {
String l = leftTrim(lines.get(lineNum));
appendLine(l);
}
} finally {
if (inputStream != null) {
Expand All @@ -137,15 +163,10 @@ StringTree makeStringTreeFromFlatLines(List<String> lines) throws IOException, G
/**
* Add a new node to the correct parent node in the StringTree
*
* @param lineNum
* the current line number in the file
* @param line
* the current line of the file
*
* @throws GedcomParserException
* if there are file lines that are not well formed - see {@link LinePieces#LinePieces(String, int)}
*/
private void addNewNode(int lineNum, String line) throws GedcomParserException {
private void addNewNode() throws GedcomParserException {
LinePieces lp = new LinePieces(line, lineNum);
treeForCurrentLine.level = lp.level;
treeForCurrentLine.id = lp.id;
Expand Down Expand Up @@ -174,20 +195,16 @@ private void addNewNode(int lineNum, String line) throws GedcomParserException {
* Check that the line has a level number so we can know whether it's a new line or a continuation of the previous
* one
*
* @param lineNum
* the current line number in the file
* @param line
* the current line of the file
* @throws GedcomParserException
* if we can't determine whether the current line is a new leveled line in the file or not when strict
* line breaks are off, or that the line does not begin with a level number when strict line breaks are
* enabled.
*/
private void checkIfNewLevelLine(int lineNum, String line) throws GedcomParserException {
private void checkIfNewLevelLine() throws GedcomParserException {
beginsWithLevelAndSpace = false;
try {
// Probably sets it to true, but might not for a non-standard file - see Issue 100
beginsWithLevelAndSpace = startsWithLevelAndSpace(lineNum, line);
beginsWithLevelAndSpace = startsWithLevelAndSpace();
} catch (GedcomParserException e) {
if (parser.strictLineBreaks) {
throw e;
Expand All @@ -197,13 +214,8 @@ private void checkIfNewLevelLine(int lineNum, String line) throws GedcomParserEx

/**
* Make the current node a concatenation of the previous node.
*
* @param lineNum
* the current line number in the file
* @param line
* the current line of the file
*/
private void makeConcatenationOfPreviousNode(int lineNum, String line) {
private void makeConcatenationOfPreviousNode() {
// Doesn't begin with a level number followed by a space, and we don't have strictLineBreaks
// required, so it's probably meant to be a continuation of the previous text value.
if (mostRecentlyAdded != null) {
Expand All @@ -213,8 +225,8 @@ private void makeConcatenationOfPreviousNode(int lineNum, String line) {
treeForCurrentLine.value = line;
treeForCurrentLine.parent = mostRecentlyAdded;
mostRecentlyAdded.children.add(treeForCurrentLine);
parser.warnings.add(
"Line " + lineNum + " did not begin with a level and tag, so it was treated as a " + "non-standard continuation of the previous line.");
parser.warnings.add("Line " + lineNum + " did not begin with a level and tag, so it was treated as a "
+ "non-standard continuation of the previous line.");
} else {
parser.warnings.add("Line " + lineNum + " did not begin with a level and tag, so it was discarded.");
}
Expand All @@ -223,16 +235,11 @@ private void makeConcatenationOfPreviousNode(int lineNum, String line) {
/**
* Does this line start with a 1-2 digit level number and a space?
*
* @param lineNum
* the line number being read
* @param line
* the line being read
*
* @return true if and only if the line begins with a 1-2 digit level number followed by a space
* @throws GedcomParserException
* if the line does not begin with a 1-2 digit number followed by a space
*/
private boolean startsWithLevelAndSpace(int lineNum, String line) throws GedcomParserException {
private boolean startsWithLevelAndSpace() throws GedcomParserException {

try {
char c1 = line.charAt(0);
Expand All @@ -245,8 +252,8 @@ private boolean startsWithLevelAndSpace(int lineNum, String line) throws GedcomP
} else if (Character.isDigit(c2) && ' ' == c3) {
return true;
} else {
throw new GedcomParserException(
"Line " + lineNum + " does not begin with a 1 or 2 digit number for the level followed by a space: " + line);
throw new GedcomParserException("Line " + lineNum + " does not begin with a 1 or 2 digit number for the level followed by a space: "
+ line);
}
}
throw new GedcomParserException("Line " + lineNum + " does not begin with a 1 or 2 digit number for the level followed by a space: " + line);
Expand Down

0 comments on commit 2ed14d6

Please sign in to comment.