From 212e328cc196ea54f0e40d4329b281ed23c37c13 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 25 Jul 2016 15:16:15 +0200 Subject: [PATCH] missed to commit changes in search manager --- .../java/eu/etaxonomy/taxeditor/store/SearchManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java index e4dab75eb..bfa1e5528 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java @@ -18,6 +18,7 @@ import java.util.UUID; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; +import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IAgentService; import eu.etaxonomy.cdm.api.service.IGroupService; import eu.etaxonomy.cdm.api.service.IMediaService; @@ -58,11 +59,13 @@ public class SearchManager { public static final String WILDCARD = "*"; public static int NO_COUNT = -1; + // TODO make this configurable via preferences private static final int MAX_RESULTS_BEFORE_WARNING = 500; - public List findNames(IIdentifiableEntityServiceConfigurator configurator){ + public List findNames(IIdentifiableEntityServiceConfigurator configurator, ConversationHolder conversation){ + if(checkLargeResult(CdmStore.getService(INameService.class).countByTitle(configurator))){ List records = CdmStore.getService(INameService.class).findByTitle(configurator).getRecords(); addUuidSearchResults(records, configurator, INameService.class); @@ -121,7 +124,7 @@ public class SearchManager { String titleSearchString = configurator.getTitleSearchString(); try { UUID uuid = UUID.fromString(titleSearchString); - T foundRecord = CdmStore.getService(service).find(uuid); + T foundRecord = CdmStore.getService(service).load(uuid, configurator.getPropertyPaths()); if(foundRecord!=null){ records.add(foundRecord); } -- 2.34.1