Project

General

Profile

« Previous | Next » 

Revision 51688d00

Added by Andreas Müller almost 7 years ago

ref #6368 , ref #6671, ref #6630 adapt pesi to no taxon name model

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiDescriptionExport.java
64 64
import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
65 65
import eu.etaxonomy.cdm.model.description.TextData;
66 66
import eu.etaxonomy.cdm.model.location.NamedArea;
67
import eu.etaxonomy.cdm.model.name.TaxonName;
67 68
import eu.etaxonomy.cdm.model.taxon.Taxon;
68 69
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
69 70
import eu.etaxonomy.cdm.profiler.ProfilerController;
......
276 277
				doCount(count++, modCount, "name descriptions");
277 278
				boolean isImageGallery = desc.isImageGallery();
278 279

  
279
				TaxonNameBase<?,?> name = desc.getTaxonName();
280
				TaxonName name = desc.getTaxonName();
280 281

  
281 282
				for (DescriptionElementBase element : desc.getElements()){
282 283
					if (isPurePesiName(name)){
......
517 518
		ExtensionType taxCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.taxCommentUuid);
518 519
		ExtensionType fauCommentExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauCommentUuid);
519 520
		ExtensionType fauExtraCodesExtensionType = (ExtensionType)getTermService().find(PesiTransformer.fauExtraCodesUuid);
520
		List<TaxonNameBase> taxonNameList = null;
521
		List<TaxonName> taxonNameList = null;
521 522

  
522 523
		int count = 0;
523 524
		int pastCount = 0;
......
527 528
		while ((taxonNameList = getNameService().list(null, limit, count, null, null)).size() > 0) {
528 529

  
529 530
			logger.info("Fetched " + taxonNameList.size() + " names. Exporting...");
530
			for (TaxonNameBase<?,?> taxonName : taxonNameList) {
531
			for (TaxonName taxonName : taxonNameList) {
531 532
				Set<Extension> extensions = taxonName.getExtensions();
532 533
				for (Extension extension : extensions) {
533 534
					if (extension.getType().equals(taxCommentExtensionType)) {
......
818 819
	 * @param state The {@link DbExportStateBase DbExportState}.
819 820
	 * @return
820 821
	 */
821
	private static Integer getTaxonKey(TaxonNameBase<?,?> taxonName, DbExportStateBase<?, PesiTransformer> state) {
822
	private static Integer getTaxonKey(TaxonName taxonName, DbExportStateBase<?, PesiTransformer> state) {
822 823
		return state.getDbId(taxonName);
823 824
	}
824 825

  
......
832 833
	private static String getTaxonFullNameCache(DescriptionElementBase deb, PesiExportState state) {
833 834

  
834 835
		TaxonBase<?> taxon =  state.getCurrentTaxon();
835
		TaxonNameBase<?,?> taxonName = taxon.getName();
836
		NonViralName<?> nvn = CdmBase.deproxy(taxonName, NonViralName.class);
836
		TaxonName taxonName = taxon.getName();
837
		TaxonName nvn = CdmBase.deproxy(taxonName);
837 838
		String result = getCacheStrategy(nvn).getTitleCache(nvn);
838 839
		return result;
839 840
	}

Also available in: Unified diff