Commit a32e0be5 authored by Matija Obreza's avatar Matija Obreza
Browse files

Fixed broken build

parent 374f6a48
......@@ -205,27 +205,27 @@ public class PDCICalculator implements InitializingBean {
}
if (coll != null) {
if (StringUtils.isNotBlank(coll.collSite)) {
if (StringUtils.isNotBlank(coll.getCollSite())) {
if (hasLatLng)
pdci.setCollSite(20);
else
pdci.setCollSite(70);
}
if (StringUtils.isNotBlank(coll.collDate)) {
if (StringUtils.isNotBlank(coll.getCollDate())) {
pdci.setCollDate(30);
}
if (coll.collSrc != null) {
if (coll.getCollSrc() != null) {
pdci.setCollSrc(30);
}
if (StringUtils.isNotBlank(coll.collNumb)) {
if (StringUtils.isNotBlank(coll.getCollNumb())) {
pdci.setCollNumb(60);
}
if (coll.collCode != null && coll.collCode.size() > 0) {
if (coll.getCollCode() != null && coll.getCollCode().size() > 0) {
pdci.setCollCode(40);
} else {
if (StringUtils.isNotBlank(coll.collName)) {
if (StringUtils.isNotBlank(coll.getCollName())) {
pdci.setCollName(20);
}
}
......@@ -255,14 +255,14 @@ public class PDCICalculator implements InitializingBean {
}
if (coll != null) {
if (StringUtils.isNotBlank(coll.collSite)) {
if (StringUtils.isNotBlank(coll.getCollSite())) {
if (hasLatLng)
pdci.setCollSite(15);
else
pdci.setCollSite(45);
}
if (StringUtils.isNotBlank(coll.collDate)) {
if (StringUtils.isNotBlank(coll.getCollDate())) {
pdci.setCollDate(30);
}
......@@ -270,7 +270,7 @@ public class PDCICalculator implements InitializingBean {
pdci.setAncest(10);
}
if (coll.collSrc != null) {
if (coll.getCollSrc() != null) {
pdci.setCollSrc(50);
}
......@@ -278,13 +278,13 @@ public class PDCICalculator implements InitializingBean {
pdci.setAcceName(50);
}
if (StringUtils.isNotBlank(coll.collNumb)) {
if (StringUtils.isNotBlank(coll.getCollNumb())) {
pdci.setCollNumb(40);
}
if (coll.collCode != null && coll.collCode.size() > 0) {
if (coll.getCollCode() != null && coll.getCollCode().size() > 0) {
pdci.setCollCode(30);
} else {
if (StringUtils.isNotBlank(coll.collName)) {
if (StringUtils.isNotBlank(coll.getCollName())) {
pdci.setCollName(15);
}
}
......@@ -307,13 +307,13 @@ public class PDCICalculator implements InitializingBean {
}
if (coll != null) {
if (StringUtils.isNotBlank(coll.collSite)) {
if (StringUtils.isNotBlank(coll.getCollSite())) {
}
if (StringUtils.isNotBlank(coll.collDate)) {
if (StringUtils.isNotBlank(coll.getCollDate())) {
}
if (coll.collSrc != null) {
if (coll.getCollSrc() != null) {
pdci.setCollSrc(20);
}
......@@ -321,10 +321,10 @@ public class PDCICalculator implements InitializingBean {
pdci.setAcceName(80);
}
if (StringUtils.isNotBlank(coll.collNumb)) {
if (StringUtils.isNotBlank(coll.getCollNumb())) {
}
if (coll.collCode != null && coll.collCode.size() > 0) {
if (coll.getCollCode() != null && coll.getCollCode().size() > 0) {
}
}
}
......@@ -345,13 +345,13 @@ public class PDCICalculator implements InitializingBean {
}
if (coll != null) {
if (StringUtils.isNotBlank(coll.collSite)) {
if (StringUtils.isNotBlank(coll.getCollSite())) {
}
if (StringUtils.isNotBlank(coll.collDate)) {
if (StringUtils.isNotBlank(coll.getCollDate())) {
}
if (coll.collSrc != null) {
if (coll.getCollSrc() != null) {
pdci.setCollSrc(20);
}
......@@ -359,10 +359,10 @@ public class PDCICalculator implements InitializingBean {
pdci.setAcceName(160);
}
if (StringUtils.isNotBlank(coll.collNumb)) {
if (StringUtils.isNotBlank(coll.getCollNumb())) {
}
if (coll.collCode != null && coll.collCode.size() > 0) {
if (coll.getCollCode() != null && coll.getCollCode().size() > 0) {
}
}
}
......@@ -402,28 +402,28 @@ public class PDCICalculator implements InitializingBean {
}
if (coll != null) {
if (StringUtils.isNotBlank(coll.collSite)) {
if (StringUtils.isNotBlank(coll.getCollSite())) {
if (hasLatLng)
pdci.setCollSite(10);
else
pdci.setCollSite(20);
}
if (StringUtils.isNotBlank(coll.collDate)) {
if (StringUtils.isNotBlank(coll.getCollDate())) {
pdci.setCollDate(10);
}
if (coll.collSrc != null) {
if (coll.getCollSrc() != null) {
pdci.setCollSrc(25);
}
if (StringUtils.isNotBlank(coll.collNumb)) {
if (StringUtils.isNotBlank(coll.getCollNumb())) {
pdci.setCollNumb(20);
}
if (coll.collCode != null && coll.collCode.size() > 0) {
if (coll.getCollCode() != null && coll.getCollCode().size() > 0) {
pdci.setCollCode(20);
} else {
if (StringUtils.isNotBlank(coll.collName)) {
if (StringUtils.isNotBlank(coll.getCollName())) {
pdci.setCollName(10);
}
}
......
......@@ -364,7 +364,7 @@ public class ElasticsearchTest {
Page<AccessionDetails> a = elasticService.filter(filters, new PageRequest(0, 100));
LOG.info("Size: " + a.getNumberOfElements() + " total=" + a.getTotalElements());
for (AccessionDetails aa : a.getContent()) {
assertTrue(aa.getColl().collMissId.equals("SDC-CLVNET GERMPLASM COLLECTING PROJECT"));
assertTrue(aa.getColl().getCollMissId().equals("SDC-CLVNET GERMPLASM COLLECTING PROJECT"));
LOG.info(mapper.writeValueAsString(aa));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment