Project

General

Profile

« Previous | Next » 

Revision 52002c73

Added by Cherian Mathew over 9 years ago

merge from trunk

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
56 56 
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
57 57 
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
58 58 
import eu.etaxonomy.cdm.model.description.Feature;
59 
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
59 
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
60 60 
import eu.etaxonomy.cdm.model.location.NamedArea;
61 61 
import eu.etaxonomy.cdm.model.media.Media;
62 62 
import eu.etaxonomy.cdm.model.media.MediaRepresentation;
......
83 83 
import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
84 84 
import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
85 85 
import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
86 
import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
87 86 

  		




  88
  87
  
    
/**


  		




  89
  88
  
    
 * @author pplitzner


  		




  ......




  1064
  1063
  
    
        return defaultTaxonService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);


  		




  1065
  1064
  
    
    }


  		




  1066
  1065
  
    

  		




  1067
  
  
    
    /**


  		




  1068
  
  
    
     * @param areaFilter


  		




  1069
  
  
    
     * @param statusFilter


  		




  1070
  
  
    
     * @param classification


  		




  1071
  
  
    
     * @param pageSize


  		




  1072
  
  
    
     * @param pageNumber


  		




  1073
  
  
    
     * @param orderHints


  		




  1074
  
  
    
     * @param propertyPaths


  		




  1075
  
  
    
     * @return


  		




  1076
  
  
    
     * @throws IOException


  		




  1077
  
  
    
     * @throws ParseException


  		




  
  1066
  
    

  		




  
  1067
  
    
    /* (non-Javadoc)


  		




  1078
  1068
  
    
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByDistribution(java.util.List, java.util.List, eu.etaxonomy.cdm.model.taxon.Classification, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)


  		




  1079
  1069
  
    
     */


  		




  1080
  1070
  
    
    @Override


  		




  1081
  
  
    
    public Pager<SearchResult<TaxonBase>> findByDistribution(List<NamedArea> areaFilter, List<PresenceAbsenceTermBase<?>> statusFilter, Classification classification, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws IOException, ParseException {


  		




  
  1071
  
    
    public Pager<SearchResult<TaxonBase>> findByDistribution(List<NamedArea> areaFilter,


  		




  
  1072
  
    
            List<PresenceAbsenceTerm> statusFilter, Classification classification, Integer pageSize,


  		




  
  1073
  
    
            Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws IOException,


  		




  
  1074
  
    
            ParseException {


  		




  1082
  1075
  
    
        return defaultTaxonService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths);


  		




  1083
  1076
  
    
    }


  		




  1084
  1077
  
    

  		




  1085
  
  
    
    /**


  		




  1086
  
  
    
     * @param searchModes


  		




  1087
  
  
    
     * @param queryString


  		




  1088
  
  
    
     * @param classification


  		




  1089
  
  
    
     * @param namedAreas


  		




  1090
  
  
    
     * @param distributionStatus


  		




  1091
  
  
    
     * @param languages


  		




  1092
  
  
    
     * @param highlightFragments


  		




  1093
  
  
    
     * @param pageSize


  		




  1094
  
  
    
     * @param pageNumber


  		




  1095
  
  
    
     * @param orderHints


  		




  1096
  
  
    
     * @param propertyPaths


  		




  1097
  
  
    
     * @return


  		




  1098
  
  
    
     * @throws CorruptIndexException


  		




  1099
  
  
    
     * @throws IOException


  		




  1100
  
  
    
     * @throws ParseException


  		




  1101
  
  
    
     * @throws LuceneMultiSearchException


  		




  
  1078
  
    

  		




  
  1079
  
    
    /* (non-Javadoc)


  		




  1102
  1080
  
    
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaAndNamesByFullText(java.util.EnumSet, java.lang.String, eu.etaxonomy.cdm.model.taxon.Classification, java.util.Set, java.util.Set, java.util.List, boolean, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)


  		




  1103
  1081
  
    
     */


  		




  1104
  1082
  
    
    @Override


  		




  1105
  
  
    
    public Pager<SearchResult<TaxonBase>> findTaxaAndNamesByFullText(EnumSet<TaxaAndNamesSearchMode> searchModes, String queryString, Classification classification, Set<NamedArea> namedAreas, Set<PresenceAbsenceTermBase<?>> distributionStatus, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {


  		




  
  1083
  
    
    public Pager<SearchResult<TaxonBase>> findTaxaAndNamesByFullText(EnumSet<TaxaAndNamesSearchMode> searchModes,


  		




  
  1084
  
    
            String queryString, Classification classification, Set<NamedArea> namedAreas,


  		




  
  1085
  
    
            Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,


  		




  
  1086
  
    
            Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)


  		




  
  1087
  
    
            throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {


  		




  1106
  1088
  
    
        return defaultTaxonService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);


  		




  1107
  1089
  
    
    }


  		




  1108
  1090
  
    

  		












Also available in:  Unified diff