Project

General

Profile

« Previous | Next » 

Revision e56ebfbd

Added by Katja Luther over 1 year ago

ref #10156: addOriginals to taxonServive.listMedia

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
769 769
    public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
770 770
            Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences,
771 771
            Boolean includeTaxonNameDescriptions, List<String> propertyPath);
772
    
773
    /**
774
     * Lists all Media found in an any TaxonDescription, NameDescription,
775
     * SpecimenOrObservationBase, DnaSample Chromatograms, etc. associated with this taxon.
776
     *
777
     * @param taxon
778
     * @param includeRelationships
779
     *            the given list of TaxonRelationshipEdges will be taken into
780
     *            account when retrieving media associated with the given taxon.
781
     *            Can be NULL.
782
     * @param limitToGalleries
783
     *            whether to take only descriptions into account which are
784
     *            marked as gallery, can be NULL
785
     * @param includeTaxonDescriptions
786
     *            whether to take TaxonDescriptions into account, can be NULL
787
     * @param includeOccurrences
788
     *          whether to take SpecimenDescriptions into account, can be NULL
789
     * @param includeOriginals
790
     *          whether to take SpecimenDescriptions of the originals of associated derived units into account, can be NULL
791
     * @param includeTaxonNameDescriptions
792
     *       whether to take TaxonNameDescriptions into account, can be NULL
793
     * @param propertyPath
794
     * @return
795
     */
796
    public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
797
            Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeOriginals,
798
            Boolean includeTaxonNameDescriptions, List<String> propertyPath);
772 799

  
773 800
    public List<TaxonBase> findTaxaByID(Set<Integer> listOfIDs);
774 801

  
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
967 967
    public List<Media> listTaxonDescriptionMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, boolean limitToGalleries, List<String> propertyPath){
968 968
        return listMedia(taxon, includeRelationships, limitToGalleries, true, false, false, propertyPath);
969 969
    }
970

  
970
    
971 971
    @Override
972 972
    public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
973 973
            Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences,
974 974
            Boolean includeTaxonNameDescriptions, List<String> propertyPath) {
975
    	return  listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, false,
976
                includeTaxonNameDescriptions, propertyPath);
977
    }
978

  
979
    @Override
980
    public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships,
981
            Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeOriginalOccurences,
982
            Boolean includeTaxonNameDescriptions, List<String> propertyPath) {
975 983

  
976 984
        //TODO let inherit
977 985
        boolean includeUnpublished = INCLUDE_UNPUBLISHED;
......
1059 1067
                }
1060 1068
                //media in hierarchy
1061 1069
                taxonMedia.addAll(occurrenceService.getMediaInHierarchy(occurrence, null, null, propertyPath).getRecords());
1070
                
1062 1071
            }
1063 1072
        }
1064 1073

  

Also available in: Unified diff