Skip to content

Commit 153c3f2

Browse files
- CHG: Updated dependencies.
- CHG: Version bump.
1 parent 4a9628e commit 153c3f2

5 files changed

Lines changed: 65 additions & 30 deletions

File tree

.idea/workspace.xml

Lines changed: 61 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
group 'uk.ac.hutton.germinate-importer'
6-
version '4.7.0'
6+
version '4.7.1'
77

88
compileJava.options.encoding = 'UTF-8'
99
sourceCompatibility = 11

src/main/java/jhi/germinate/server/util/importer/DatasheetImporter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ private void checkAttributeSheet(Sheet s)
128128
addImportResult(ImportStatus.GENERIC_INVALID_DATATYPE, r.getRowNum(), "Data Type: " + dataType);
129129
if (StringUtils.isEmpty(attribute))
130130
addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, r.getRowNum(), "Attribute");
131-
if (StringUtils.isEmpty(value))
132-
addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, r.getRowNum(), "Value");
131+
// if (StringUtils.isEmpty(value))
132+
// addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, r.getRowNum(), "Value");
133133
});
134134
}
135135
catch (IOException e)
@@ -436,7 +436,7 @@ private void getOrCreateAttributes(DSLContext context, ReadableWorkbook wb)
436436
}
437437
String value = getCellValue(r, 2);
438438

439-
if (dt == null && StringUtils.isEmpty(attribute) && StringUtils.isEmpty(value))
439+
if (dt == null || StringUtils.isEmpty(attribute) || StringUtils.isEmpty(value))
440440
return;
441441

442442
Integer attributeId = attributeToId.get(attribute);

0 commit comments

Comments
 (0)