diff --git a/.gitignore b/.gitignore index 551b9f5..93e54cf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ *.classpath *.project *.pyc +.DS_Store client/java/*/bin -client/java/*/build -client/java/*/dist +client/java/*/build \ No newline at end of file diff --git a/client/java/lookup/src/uk/ac/kcl/cch/eats/lookup/LookupController.java b/client/java/lookup/src/uk/ac/kcl/cch/eats/lookup/LookupController.java old mode 100644 new mode 100755 index f8f4f1f..864bca3 --- a/client/java/lookup/src/uk/ac/kcl/cch/eats/lookup/LookupController.java +++ b/client/java/lookup/src/uk/ac/kcl/cch/eats/lookup/LookupController.java @@ -712,7 +712,13 @@ private void findAction() throws DispatcherException, URISyntaxException { List 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); diff --git a/client/java/oxygen/.DS_Store b/client/java/oxygen/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/client/java/oxygen/.DS_Store differ diff --git a/client/java/oxygen/dist/eatslookup-oxygen.zip b/client/java/oxygen/dist/eatslookup-oxygen.zip index 4c1d9f3..3649f04 100644 Binary files a/client/java/oxygen/dist/eatslookup-oxygen.zip and b/client/java/oxygen/dist/eatslookup-oxygen.zip differ diff --git a/client/java/oxygen/dist/eatslookup-oxygen/eatslookup-oxygen.jar b/client/java/oxygen/dist/eatslookup-oxygen/eatslookup-oxygen.jar index 5d8d450..4535a1e 100644 Binary files a/client/java/oxygen/dist/eatslookup-oxygen/eatslookup-oxygen.jar and b/client/java/oxygen/dist/eatslookup-oxygen/eatslookup-oxygen.jar differ diff --git a/client/java/oxygen/dist/eatslookup-oxygen/eatslookup.jar b/client/java/oxygen/dist/eatslookup-oxygen/eatslookup.jar index 7cb859d..cb900fd 100644 Binary files a/client/java/oxygen/dist/eatslookup-oxygen/eatslookup.jar and b/client/java/oxygen/dist/eatslookup-oxygen/eatslookup.jar differ diff --git a/client/java/oxygen/lib/eatslookup.jar b/client/java/oxygen/lib/eatslookup.jar index 7cb859d..cb900fd 100644 Binary files a/client/java/oxygen/lib/eatslookup.jar and b/client/java/oxygen/lib/eatslookup.jar differ