Skip to content

Fix resource handling for CSV reader #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
herrtunante wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix resource handling for CSV reader #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ...llect-earth-core/src/main/java/org/openforis/collect/earth/core/utils/CsvReaderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,16 @@ public static CSVReader getCsvReader(String csvFile, boolean checkContainsCoordi
CSVReader csvReader = null;
for (char c : possibleSeparators) {
CSVReader commaSeparatedReader = getCsvReader(csvFile, c, skipHeader);
if (!checkContainsCoordinates) {
return commaSeparatedReader;
} else if (checkCsvReaderWorks(commaSeparatedReader)) {
csvReader = getCsvReader(csvFile, c, skipHeader); // Get the reader again so that it starts from the
// first column
break;
} else {
commaSeparatedReader.close();
}
if (!checkContainsCoordinates) {
return commaSeparatedReader;
} else if (checkCsvReaderWorks(commaSeparatedReader)) {
commaSeparatedReader.close();
csvReader = getCsvReader(csvFile, c, skipHeader); // Get the reader again so that it starts from the
// first column
break;
} else {
commaSeparatedReader.close();
}
}

if (csvReader == null) {
Expand Down
Loading