diff --git a/dbrepo-search-service/app/opensearch_client.py b/dbrepo-search-service/app/opensearch_client.py index c98ab001a85a62ee3be86f7cbbf4221084f5e126..52991e9721db05e1d1aceb55fdbe9c512885bf8d 100644 --- a/dbrepo-search-service/app/opensearch_client.py +++ b/dbrepo-search-service/app/opensearch_client.py @@ -255,6 +255,12 @@ def general_search(search_term=None, t1=None, t2=None, fieldValuePairs=None): "identifier.*", "column_type", "description", + "titles", + "descriptions", + "funders", + "licenses", + "creators", + "visibility", "title", "type", "uri", diff --git a/dbrepo-ui/pages/search/index.vue b/dbrepo-ui/pages/search/index.vue index 027db242e8620c277830db89251ac2cafa5525b7..6db2a9450e284456c8a276094dbee089a610db7f 100644 --- a/dbrepo-ui/pages/search/index.vue +++ b/dbrepo-ui/pages/search/index.vue @@ -50,6 +50,7 @@ import SearchService from '@/api/search.service' import CreateDB from '@/components/dialogs/CreateDB' import AdvancedSearch from '@/components/search/AdvancedSearch' +import IdentifierMapper from '@/api/identifier.mapper' export default { components: { @@ -202,15 +203,17 @@ export default { if (this.isDatabase(item) || this.isTable(item) || this.isColumn(item) || this.isView(item) || this.isConcept(item) || this.isUnit(item)) { return item.name } else if (this.isIdentifier(item)) { - return item.title + return IdentifierMapper.identifierPreferEnglishTitle(item) } else if (this.isUser(item)) { return item.username } return null }, description (item) { - if (this.isDatabase(item) || this.isTable(item) || this.isIdentifier(item) || this.isConcept(item) || this.isUnit(item)) { + if (this.isDatabase(item) || this.isTable(item) || this.isConcept(item) || this.isUnit(item)) { return item.description + } else if (this.isIdentifier(item)) { + return IdentifierMapper.identifierPreferEnglishDescription(item) } else if (this.isColumn(item)) { return null } else if (this.isView(item)) {