Revision 8fdfd0c6
Added by Katja Luther about 8 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java | ||
|---|---|---|
| 16 | 16 |
import java.util.UUID; |
| 17 | 17 |
|
| 18 | 18 |
import org.apache.log4j.Logger; |
| 19 |
import org.springframework.beans.factory.annotation.Autowired; |
|
| 19 | 20 |
import org.springframework.stereotype.Component; |
| 20 |
import org.unitils.spring.annotation.SpringBeanByType; |
|
| 21 | 21 |
|
| 22 | 22 |
import eu.etaxonomy.cdm.api.service.dto.CondensedDistribution; |
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 24 | 24 |
import eu.etaxonomy.cdm.ext.geo.CondensedDistributionRecipe; |
| 25 |
import eu.etaxonomy.cdm.ext.geo.EditGeoService; |
|
| 25 |
import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
|
|
| 26 | 26 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.common.Language; |
| ... | ... | |
| 30 | 30 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.description.Distribution; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 33 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
|
| 34 | 33 |
import eu.etaxonomy.cdm.model.description.TextData; |
| 35 | 34 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 36 | 35 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| ... | ... | |
| 58 | 57 |
public class CsvNameExport extends CsvNameExportBase {
|
| 59 | 58 |
private static final Logger logger = Logger.getLogger(CsvNameExport.class); |
| 60 | 59 |
|
| 61 |
@SpringBeanByType
|
|
| 62 |
EditGeoService geoService; |
|
| 60 |
@Autowired
|
|
| 61 |
IEditGeoService geoService;
|
|
| 63 | 62 |
|
| 64 | 63 |
public CsvNameExport() {
|
| 65 | 64 |
super(); |
| ... | ... | |
| 282 | 281 |
private void extractDescriptions(HashMap<String, String> nameRecord, Taxon taxon, Feature feature, String columnName, CsvNameExportState state){
|
| 283 | 282 |
StringBuffer descriptionsString = new StringBuffer(); |
| 284 | 283 |
TextData textElement; |
| 285 |
List<Distribution> distributions = new ArrayList<Distribution>();
|
|
| 284 |
Set<Distribution> distributions = new HashSet<Distribution>();
|
|
| 286 | 285 |
for (DescriptionBase<?> descriptionBase: taxon.getDescriptions()){
|
| 287 | 286 |
|
| 288 | 287 |
Set<DescriptionElementBase> elements = descriptionBase.getElements(); |
| ... | ... | |
| 292 | 291 |
textElement = HibernateProxyHelper.deproxy(element, TextData.class); |
| 293 | 292 |
descriptionsString.append(textElement.getText(Language.ENGLISH())); |
| 294 | 293 |
|
| 295 |
}else if (element instanceof Distribution && ! state.getConfig().isCondensedDistribution()){
|
|
| 294 |
}else if (element instanceof Distribution ){
|
|
| 296 | 295 |
|
| 297 | 296 |
Distribution distribution = HibernateProxyHelper.deproxy(element, Distribution.class); |
| 298 | 297 |
distributions.add(distribution); |
| ... | ... | |
| 311 | 310 |
if (state.getConfig().isCondensedDistribution()){
|
| 312 | 311 |
List<Language> langs = new ArrayList<Language>(); |
| 313 | 312 |
langs.add(Language.ENGLISH()); |
| 314 |
List<TaxonDescription> descriptions = new ArrayList(taxon.getDescriptions()); |
|
| 315 | 313 |
|
| 316 |
CondensedDistribution conDis = geoService.getCondensedDistribution(descriptions, true, null,null,CondensedDistributionRecipe.FloraCuba, langs ); |
|
| 314 |
|
|
| 315 |
CondensedDistribution conDis = geoService.getCondensedDistribution(distributions, true, null,null,CondensedDistributionRecipe.FloraCuba, langs ); |
|
| 317 | 316 |
|
| 318 | 317 |
nameRecord.put(columnName, conDis.toString()); |
| 319 | 318 |
|
Also available in: Unified diff
minor