Skip to content
Snippets Groups Projects

Adf tsv fix for list

Merged Alicia.DeDiosFuente requested to merge adf-tsv-fix-for-list into master
@@ -240,9 +240,10 @@ public class Xml2TsvConvertor {
sb.append(((Collaboration) contributor).getName()).append(CELL_SEPARATOR);
}
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -278,12 +279,13 @@ public class Xml2TsvConvertor {
sb.append("\"");
for (Text abstractText : abstracts.getAbstract()) {
sb.append(abstractText.getContent()).append(";")
sb.append(CleanTool.replaceBlankCharsBySpace(abstractText.getContent())).append(";")
.append(abstractText.getLang()).append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.append("\"").toString();
}
@@ -297,8 +299,10 @@ public class Xml2TsvConvertor {
sb.append(classification.getCode()).append(";")
.append(classification.getItem()).append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -323,8 +327,10 @@ public class Xml2TsvConvertor {
.append(funding.getJurisdiction()).append(";")
.append(funding.getProgram()).append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -334,8 +340,10 @@ public class Xml2TsvConvertor {
sb.append(structure.getName()).append(";")
.append(structure.getCode()).append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -345,8 +353,10 @@ public class Xml2TsvConvertor {
sb.append(group.getName()).append(";")
.append(group.getCode() != null ? group.getCode() : "").append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -355,8 +365,10 @@ public class Xml2TsvConvertor {
for (String url : urls) {
sb.append(url).append(";");
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -386,8 +398,10 @@ public class Xml2TsvConvertor {
.append(file.getEmbargo() != null ? file.getEmbargo().getEndDate() : "").append(";")
.append(file.getEmbargo() != null ? file.getEmbargo().getAccessLevel() : "").append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
@@ -399,8 +413,10 @@ public class Xml2TsvConvertor {
.append(correction.getDoi() != null ? correction.getDoi() : "").append(";")
.append(correction.getPmid() != null ? correction.getPmid() : "").append(CELL_SEPARATOR);
}
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
if (!sb.isEmpty()) {
// Delete last CELL_SEPARATOR
sb.deleteCharAt(sb.length() - 1);
}
return sb.toString();
}
Loading