X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/1e0d512e4d15f95ac638eec7e4ee5f4b5160c406..e717cfb4b4d21443dcee8ebd487260ec081f490f:/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
index 8a9fe17bc7..a80ac51fbb 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
@@ -134,6 +134,28 @@ public abstract class IdentifiableServiceBase<T extends IdentifiableEntity,DAO e
 		  return new DefaultPagerImpl<T>(pageNumber, numberOfResults, pageSize, results);
 	}
 	
+	@Transactional(readOnly = true)
+	public List<T> listByTitle(Class<? extends T> clazz, String queryString,MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+		 Integer numberOfResults = dao.countByTitle(clazz, queryString, matchmode, criteria);
+			
+		 List<T> results = new ArrayList<T>();
+		 if(numberOfResults > 0) { // no point checking again
+				results = dao.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); 
+		 }
+		 return results;
+	}
+
+	@Transactional(readOnly = true)
+	public List<T> listByReferenceTitle(Class<? extends T> clazz, String queryString,MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+		 Integer numberOfResults = dao.countByTitle(clazz, queryString, matchmode, criteria);
+			
+		 List<T> results = new ArrayList<T>();
+		 if(numberOfResults > 0) { // no point checking again
+				results = dao.findByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); 
+		 }
+		 return results;
+	}
+	
 	@Transactional(readOnly = true)
 	public T find(LSID lsid) {
 		return dao.find(lsid);
@@ -182,17 +204,19 @@ public abstract class IdentifiableServiceBase<T extends IdentifiableEntity,DAO e
 						}
 					}
 					entity.setCacheStrategy(entityCacheStrategy);
-					//entity.setTitleCache(null);
-					setOtherCachesNull(entity); //TODO find better solution
+					//TODO this won't work for those classes that always generate the title cache new
 					String titleCache = entity.getTitleCache();
+					setOtherCachesNull(entity); //TODO find better solution
 					String newTitleCache = entityCacheStrategy.getTitleCache(entity);
-					if (titleCache != null && ! titleCache.equals(newTitleCache)){
+					if (titleCache == null || titleCache != null && ! titleCache.equals(newTitleCache)){
+						entity.setTitleCache(null, false);
 						entity.getTitleCache();
 						entitiesToUpdate.add(entity);
 					}
 				}
 			}
-			saveOrUpdateAll(list);
+			saveOrUpdate(entitiesToUpdate);
+			
 		}
 	}