Project

General

Profile

« Previous | Next » 

Revision 443f1bb1

Added by Niels Hoffmann almost 14 years ago

merging the last changes from SPRINT-Cichoriea1 into trunk

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
13 13
import java.util.List;
14 14

  
15 15
import eu.etaxonomy.cdm.api.service.pager.Pager;
16
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
16 17
import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
17 18
import eu.etaxonomy.cdm.model.media.Media;
18 19
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
19 20
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
21
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
20 22
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
23
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
21 24
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
25
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
22 26
import eu.etaxonomy.cdm.persistence.dao.BeanInitializer;
23 27
import eu.etaxonomy.cdm.persistence.query.OrderHint;
24 28

  
......
99 103
	 * @see <a href="http://lucene.apache.org/java/2_4_0/queryparsersyntax.html">Apache Lucene - Query Parser Syntax</a>
100 104
	 */
101 105
	public Pager<SpecimenOrObservationBase> search(Class<? extends SpecimenOrObservationBase> clazz, String query, Integer pageSize,Integer pageNumber, List<OrderHint> orderHints,List<String> propertyPaths);
106
	
107
	public List<UuidAndTitleCache<FieldObservation>> getFieldObservationUuidAndTitleCache();
108
	public List<UuidAndTitleCache<DerivedUnitBase>> getDerivedUnitBaseUuidAndTitleCache();
102 109
}

Also available in: Unified diff