- fixed filtering by specimen type (UNKNOWN = wild card)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
index 460ee23cfc7247c69eb1057cada1934226453c14..a161ed4a88c0cef2d32730787f5ddcb1d8b4073d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
@@ -114,7 +114,7 @@ public class DerivateSearchCompositeController implements Listener{
 
         FindOccurrencesConfigurator config = new FindOccurrencesConfigurator();
         config.setAssociatedTaxonUuid(selectedTaxon!=null?selectedTaxon.getUuid():null);
-        config.setSpecimenType(specimenType==SpecimenOrObservationType.Unknown?null:specimenType);//unknown := all types
+        config.setSpecimenType(specimenType.equals(SpecimenOrObservationType.Unknown)?null:specimenType);//unknown := all types
         config.setTitleSearchString(queryString);
         if(selectedTaxon!=null){
             config.setRetrieveIndirectlyAssociatedSpecimens(true);
@@ -125,11 +125,11 @@ public class DerivateSearchCompositeController implements Listener{
         List<SpecimenOrObservationBase> occurrences = searchManager.findOccurrences(config);
 
         //filter out specimens of wrong type (only if an associated taxon was selected)
-        if(selectedTaxon!=null){
+        if(selectedTaxon!=null && !specimenType.equals(SpecimenOrObservationType.Unknown)){
             List<SpecimenOrObservationBase> specimensOfCorrectType = new ArrayList<SpecimenOrObservationBase>();
             for(SpecimenOrObservationBase<?> occurrence:occurrences){
-                if(occurrence.getRecordBasis().equals(comboSpecimenTypeController.getSelection())
-                        || occurrence.getRecordBasis().isKindOf(comboSpecimenTypeController.getSelection())){
+                if(occurrence.getRecordBasis().equals(specimenType)
+                        || occurrence.getRecordBasis().isKindOf(specimenType)){
                     specimensOfCorrectType.add(occurrence);
                 }
             }