Skip to content
Open
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
*.classpath
*.project
*.pyc
.DS_Store
client/java/*/bin
client/java/*/build
client/java/*/dist
client/java/*/build
8 changes: 7 additions & 1 deletion client/java/lookup/src/uk/ac/kcl/cch/eats/lookup/LookupController.java
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,13 @@ private void findAction() throws DispatcherException, URISyntaxException {
List<EntityType> etList = EatsMlUtils.getAuthorityEntityTypes(entity, authority);

if (etList != null) {
data[ENTITY_TYPE_COLUMN] = etList.get(0).getName();
// there may be more than one entity type, so display each of them
StringBuilder sb = new StringBuilder();
for (EntityType et : etList) {
sb.append(et.getName());
sb.append(" ");
}
data[ENTITY_TYPE_COLUMN] = sb.toString().trim();
}

model.addRow(data);
Expand Down
Binary file added client/java/oxygen/.DS_Store
Binary file not shown.
Binary file modified client/java/oxygen/dist/eatslookup-oxygen.zip
Binary file not shown.
Binary file modified client/java/oxygen/dist/eatslookup-oxygen/eatslookup-oxygen.jar
Binary file not shown.
Binary file modified client/java/oxygen/dist/eatslookup-oxygen/eatslookup.jar
Binary file not shown.
Binary file modified client/java/oxygen/lib/eatslookup.jar
Binary file not shown.