revert last minor change in misapplied name search

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
index f42645d99fdd39ade32db3c9f9bdccb6f856dcb9..6cc4f481ef96881c873b5f5a2800cfee0dacad1c 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
@@ -1474,7 +1474,7 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                 if(doAreaRestriction){
                     misappliedSelect = String.format(doAreaRestrictionMisappliedNameSubSelect, "t") + doTaxonNameJoin + doMisappliedNamesJoin  +
                     " WHERE " + doAreaRestrictionWhere +
-                    " AND " + String.format(doSearchFieldWhere, "n2") +
+                    " AND " + String.format(doSearchFieldWhere, "n") +
                     " AND " + doClassificationForMisappliedNamesWhere +
                     " AND " + doRelationshipTypeComparison;
 
@@ -1491,7 +1491,7 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                             " AND "+ doClassificationWhere + " AND " + doCommonNamesRestrictionWhere;
                 } else {
                     misappliedSelect = String.format(doTaxonMisappliedNameSubSelect, "t" ) + doTaxonNameJoin + doMisappliedNamesJoin +
-                    " WHERE " + String.format(doSearchFieldWhere, "n2") +
+                    " WHERE " + String.format(doSearchFieldWhere, "n") +
                     " AND " + doClassificationForMisappliedNamesWhere +
                     " AND " + doRelationshipTypeComparison;
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java
index 0e4e8f37610a4ee0626cae3125c07e427fb46f1a..4776c813b34a0d5a4f42ca9ef236e9da5bf4c74d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java
@@ -550,7 +550,10 @@ public class TaxonServiceSearchTaxaAndNamesTest extends CdmTransactionalIntegrat
 
         List<IdentifiableEntity> list = pager.getRecords();
         assertEquals(1, list.size());
-
+        configurator.setTitleSearchString("Abies*");
+        configurator.setDoTaxa(false);
+        configurator.setDoSynonyms(false);
+        configurator.setDoNamesWithoutTaxa(false);
         configurator.setDoTaxaByCommonNames(true);
         configurator.setDoMisappliedNames(true);
         configurator.setClassification(classificationService.load(UUID.fromString(CLASSIFICATION_UUID)));