Project

General

Profile

« Previous | Next » 

Revision 98838827

Added by Katja Luther over 7 years ago

fix #6061: search for titlecache if abbrev title is empty

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
181 181

  
182 182
        Query query = null;
183 183
        if (pattern != null){
184
            query = session.createQuery("select uuid, id, nomenclaturalTitle, titlecache from " + type.getSimpleName() +" where nomenclaturalTitle like :pattern" + clazzString);
184
            if (clazzString != ""){
185
                query = session.createQuery("SELECT uuid, id, nomenclaturalTitle, titleCache FROM " + type.getSimpleName() +" WHERE (nomenclaturalTitle LIKE :pattern OR (nomenclaturalTitle IS NULL AND titleCache LIKE :pattern) AND " + clazzString);
186

  
187
            } else{
188
                query = session.createQuery("SELECT uuid, id, nomenclaturalTitle, titleCache FROM " + type.getSimpleName() +" WHERE nomenclaturalTitle LIKE :pattern");
189

  
190
            }
185 191
            pattern = pattern + "%";
186 192
            pattern = pattern.replace("*", "%");
187 193
            pattern = pattern.replace("?", "_");
188 194
            query.setParameter("pattern", pattern);
189 195
        } else {
190 196
            if (clazzString != ""){
191
                query = session.createQuery("select uuid, id, nomenclaturalTitle, titleCache from " + type.getSimpleName() + " where " + clazzString);
197
                query = session.createQuery("SELECT uuid, id, nomenclaturalTitle, titleCache FROM " + type.getSimpleName() + " WHERE " + clazzString);
192 198
            } else{
193
                query = session.createQuery("select uuid, id, nomenclaturalTitle, titleCache from " + type.getSimpleName());
199
                query = session.createQuery("SELECT uuid, id, nomenclaturalTitle, titleCache FROM " + type.getSimpleName());
194 200
            }
195 201
        }
196 202
        if (limit != null){

Also available in: Unified diff