...
 
......@@ -113,7 +113,13 @@ public class ImportRefsetRf1Handler implements ImportRefsetHandler {
setCommonFields(member, refset);
member.setConceptActive(true);
member.setRefset(refset);
member.setConceptId(fields[1]);
String conceptId = fields[1].trim();
if (!conceptId.equals(fields[1])) {
pbr.close();
throw new LocalException("Unexpected white space padding the concept id *"
+ fields[1] + "*");
}
member.setConceptId(conceptId);
member.setEffectiveTime(null);
// Add member
......
......@@ -143,7 +143,13 @@ public class ImportRefsetRf2DeltaHandler implements ImportRefsetHandler {
member.setTerminologyId(fields[0]);
member.setConceptActive(true);
member.setRefset(refset);
member.setConceptId(fields[5]);
String conceptId = fields[5].trim();
if (!conceptId.equals(fields[5])) {
pbr.close();
throw new LocalException("Unexpected white space padding the concept id *"
+ fields[5] + "*");
}
member.setConceptId(conceptId);
if (!fields[1].equals("")) {
try {
member.setEffectiveTime(ConfigUtility.DATE_FORMAT.parse(fields[1]));
......
......@@ -127,11 +127,17 @@ public class ImportRefsetRf2Handler implements ImportRefsetHandler {
setCommonFields(member, refset);
// save original ids if refset matches
if (refset.getTerminologyId().equals(fields[4])) {
member.setTerminologyId(fields[0]);
member.setTerminologyId(fields[0].trim());
}
member.setConceptActive(true);
member.setRefset(refset);
member.setConceptId(fields[5]);
String conceptId = fields[5].trim();
if (!conceptId.equals(fields[5])) {
pbr.close();
throw new LocalException("Unexpected white space padding the concept id *"
+ fields[5] + "*");
}
member.setConceptId(conceptId);
if (!fields[1].equals("")) {
try {
member.setEffectiveTime(ConfigUtility.DATE_FORMAT.parse(fields[1]));
......
......@@ -150,7 +150,7 @@ public class ImportTranslationRf2Handler implements ImportTranslationHandler {
throw new LocalException(
"Unexpected field count in descriptions file.");
}
if (!fields[0].equals(id)) {
if (!fields[0].endsWith(id)) {
// Skip inactive descriptions
if (fields[2].equals("0")) {
......@@ -227,7 +227,7 @@ public class ImportTranslationRf2Handler implements ImportTranslationHandler {
"Unexpected field count in language file.");
}
if (!fields[0].equals(id)) { // header
if (!fields[0].endsWith(id)) { // header
// Skip inactive language entries
if (fields[2].equals("0")) {
......@@ -243,10 +243,12 @@ public class ImportTranslationRf2Handler implements ImportTranslationHandler {
} else {
member.setTerminologyId(fields[0]);
}
if (!fields[1].equals("")) {
member.setEffectiveTime(
ConfigUtility.DATE_FORMAT.parse(fields[1]));
}
// Set from the translation refset
member.setRefsetId(translation.getRefset().getTerminologyId());
......
......@@ -1852,7 +1852,7 @@ tsApp
$scope.importFinished = false;
if ($scope.query || $scope.pfs) {
$scope.warnings
.push("Export is based on current search criteria and may not include all members.");
.push(operation + " is based on current search criteria and may not include all members.");
}
// Handle export
$scope.export = function(file) {
......
......@@ -1972,7 +1972,7 @@ tsApp
$scope.importFinished = false;
if (type == 'Translation' && ($scope.query || $scope.pfs)) {
$scope.warnings
.push("Export is based on current search criteria and may not include all concepts.");
.push(operation + " is based on current search criteria and may not include all concepts.");
}
// Handle export
......