Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,7 @@ public Concept toConcept(CacheService cacheService, OclConcept oclConcept) throw
setAllowDecimal(numeric, extras);
}

if (extras.getIsSet() != null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, so it was setting it as a set if set was either 0 or 1? (not just null)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, never mind, I see now...

concept.setSet(extras.getIsSet() == 1);
}
concept.setSet(extras.getIsSet() != null && extras.getIsSet() == 1);

concept.setRetired(oclConcept.isRetired());
if (oclConcept.isRetired()) {
Expand Down Expand Up @@ -403,9 +401,6 @@ public Item saveMapping(final CacheService cacheService, final Import update, fi
if (oclMapping.getMapType().equals(MapType.Q_AND_A)) {
item = updateOrAddAnswersFromOcl(update, oclMapping, fromConcept, toConcept);
} else {
if (!fromConcept.getSet()) {
fromConcept.setSet(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what this was supposed to do, but this does look backwards!

}
item = updateOrAddSetMembersFromOcl(update, oclMapping, fromConcept, toConcept);
}

Expand Down Expand Up @@ -586,6 +581,8 @@ Item updateOrAddSetMembersFromOcl(Import update, OclMapping oclMapping, Concept
}
}

set.setSet(!set.getSetMembers().isEmpty());

return item;
}

Expand Down