From: Patrick Plitzner
Date: Tue, 17 Nov 2015 14:30:08 +0000 (+0100)
Subject: Streamline search method due to cdmlib service changes
X-Git-Tag: 3.12.0^2~57^2~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3aa5ea5ed2278420916c49da87a355cfa9fb8180?ds=sidebyside
Streamline search method due to cdmlib service changes
---
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 8d4bf0e08..2103ba8e8 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
@@ -162,14 +162,6 @@ public class SearchManager {
*/
public List findOccurrences(IIdentifiableEntityServiceConfigurator configurator, boolean showFieldUnits){
List records = new ArrayList();
- if(configurator.getClazz()==null){
- if(showFieldUnits){
- configurator.setClazz(SpecimenOrObservationBase.class);
- }
- else{
- configurator.setClazz(DerivedUnit.class);
- }
- }
final List OCCURRENCE_INIT_STRATEGY = Arrays.asList(new String[] {
"collection",
"descriptions",
@@ -178,22 +170,8 @@ public class SearchManager {
"derivedFrom.originals"
});
configurator.setPropertyPaths(OCCURRENCE_INIT_STRATEGY);
- if(configurator.getClazz().equals(SpecimenOrObservationBase.class)){
- //get FieldUnits + DerivedUnits
- configurator.setClazz(DerivedUnit.class);
- int derivedUnitCount = CdmStore.getService(IOccurrenceService.class).countOccurrences(configurator);
- configurator.setClazz(FieldUnit.class);
- int fieldUnitCount = CdmStore.getService(IOccurrenceService.class).countOccurrences(configurator);
-
- if(checkLargeResult(derivedUnitCount+fieldUnitCount)){
- configurator.setClazz(DerivedUnit.class);
- records.addAll(CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords());
- configurator.setClazz(FieldUnit.class);
- records.addAll(CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords());
- }
- }
- else if(checkLargeResult(CdmStore.getService(IOccurrenceService.class).countOccurrences(configurator))){
+ if(checkLargeResult(CdmStore.getService(IOccurrenceService.class).countOccurrences(configurator))){
records = CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords();
}
addUuidSearchResults(records, configurator, IOccurrenceService.class);