s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #1181

Browse Source
This commit is contained in:
Adi Eyal 2017-05-05 23:38:37 +02:00
parent a6ec53c621
commit 09c00c6a19
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main/src/com/google/refine/importers/ImportingParserBase.java
View File

@ -164,16 +164,20 @@ abstract public class ImportingParserBase implements ImportingParser {
protected static int addFilenameColumn(Project project) {
String fileNameColumnName = "File";
assert project.columnModel.getColumnByName(fileNameColumnName) == null;
try {
project.columnModel.addColumn(
0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false);
if (project.columnModel.getColumnByName(fileNameColumnName) == null) {
try {
project.columnModel.addColumn(
0, new Column(project.columnModel.allocateNewCellIndex(), fileNameColumnName), false);
return 0;
} catch (ModelException e) {
// Shouldn't happen: We already checked for duplicate name.
logger.error("ModelException adding Filename column",e);
}
return -1;
} else {
return 0;
} catch (ModelException e) {
// Shouldn't happen: We already checked for duplicate name.
logger.error("ModelException adding Filename column",e);
}
return -1;
}
}