Project

General

Profile

Revision d841fb5d

IDd841fb5d1089d788f6c2f2c9495965ff89802243
Parent 8311a989
Child d1382189

Added by Katja Luther over 3 years ago

ref #6296: minor

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
1534 1534
                    commonNameSubselect =  doCommonNamesJoin +
1535 1535
                            " WHERE " +  doAreaRestrictionWhere + " AND " + doClassificationWhere +
1536 1536
                            " AND " + String.format(doSearchFieldWhere, "n")
1537
                            + "AND " + doCommonNamesRestrictionWhere;
1537
                            + " AND " + doCommonNamesRestrictionWhere;
1538 1538
                } else {
1539 1539
                    taxonSubselect = String.format(doTaxonSubSelect, "t" )+ doTaxonNameJoin +
1540 1540
                    " WHERE " + doClassificationWhere +
......
1545 1545
                    commonNameSubselect =String.format(doTaxonSubSelect, "s" )+ doCommonNamesJoin +
1546 1546
                            " WHERE "+ doAreaRestrictionWhere +
1547 1547
                             " AND " + doClassificationWhere +
1548
                            "AND " + doCommonNamesRestrictionWhere;
1548
                            " AND " + doCommonNamesRestrictionWhere;
1549 1549
                }
1550 1550
            }else{ //misappliedNames included
1551 1551
                if(doAreaRestriction){
......
1565 1565

  
1566 1566
                    commonNameSubselect= String.format(doAreaRestrictionSubSelect, "t")+ doCommonNamesJoin +
1567 1567
                            " WHERE " + doAreaRestrictionWhere +
1568
                            " AND "+ doClassificationWhere + "AND " + doCommonNamesRestrictionWhere;
1568
                            " AND "+ doClassificationWhere + " AND " + doCommonNamesRestrictionWhere;
1569 1569
                } else {
1570 1570
                    misappliedSelect = String.format(doTaxonMisappliedNameSubSelect, "t" ) + doTaxonNameJoin + doMisappliedNamesJoin +
1571 1571
                    " WHERE " + String.format(doSearchFieldWhere, "n") +
......
1581 1581
                    " AND " +  String.format(doSearchFieldWhere, "sn");
1582 1582

  
1583 1583
                    commonNameSubselect= String.format(doTaxonSubSelect, "t")+ doCommonNamesJoin +
1584
                            " WHERE " + doClassificationWhere + "AND " + doCommonNamesRestrictionWhere;
1584
                            " WHERE " + doClassificationWhere + " AND " + doCommonNamesRestrictionWhere;
1585 1585

  
1586 1586
                }
1587 1587
            }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)