Project

General

Profile

« Previous | Next » 

Revision 47fdce61

Added by Andreas Müller over 12 years ago

refactor getImageMedia() to support figures

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
129 129
			
130 130
//			Reference sec = Database.NewInstance();
131 131
//			sec.setTitleCache("XML DATA");
132
			Reference sec = config.getTaxonReference();
132
			Reference<?> sec = config.getTaxonReference();
133 133

  
134 134
			//create facade
135 135
			DerivedUnitFacade derivedUnitFacade = getFacade(dataHolder);
......
181 181
//			//add Multimedia URLs
182 182
			if(dataHolder.multimediaObjects.size() > 0){
183 183
				for (String multimediaObject : dataHolder.multimediaObjects){
184
					Media media = getImageMedia(multimediaObject, true);
184
					Media media = getImageMedia(multimediaObject, READ_MEDIA_DATA, false);
185 185
					derivedUnitFacade.addDerivedUnitMedia(media);
186 186
				}
187 187
			}
......
1033 1033
	 * @param derivedThing
1034 1034
	 * @param sec
1035 1035
	 */
1036
	private void handleIdentifications(Abcd206ImportConfigurator config, DerivedUnitFacade facade, Reference sec, Abcd206DataHolder dataHolder){
1036
	private void handleIdentifications(Abcd206ImportConfigurator config, DerivedUnitFacade facade, Reference<?> sec, Abcd206DataHolder dataHolder){
1037 1037
		NonViralName<?> taxonName = null;
1038 1038
		String fullScientificNameString;
1039 1039
		Taxon taxon = null;
......
1107 1107
			
1108 1108
			for (String strReference : dataHolder.referenceList){
1109 1109
				
1110
				Reference reference = ReferenceFactory.newGeneric();
1110
				Reference<?> reference = ReferenceFactory.newGeneric();
1111 1111
				reference.setTitleCache(strReference, true);
1112 1112
				determinationEvent.addReference(reference);
1113 1113
			}
......
1133 1133
				IndividualsAssociation individualsAssociation = IndividualsAssociation.NewInstance();
1134 1134
				individualsAssociation.setAssociatedSpecimenOrObservation(facade.innerDerivedUnit());
1135 1135
				individualsAssociation.setFeature(Feature.INDIVIDUALS_ASSOCIATION());
1136
				for(Reference citation : determinationEvent.getReferences()){
1136
				for(Reference<?> citation : determinationEvent.getReferences()){
1137 1137
					individualsAssociation.addSource(DescriptionElementSource.NewInstance(null, null, citation, null));
1138 1138
				}
1139 1139
				taxonDescription.addElement(individualsAssociation);
......
1157 1157
		if (dataHolder.nomenclatureCode.toString().equals("Botanical")){
1158 1158
			taxonName  = (BotanicalName)nvnpi.parseFullName(scientificName,NomenclaturalCode.ICBN,null);
1159 1159
			if (taxonName.hasProblem()){
1160
				problem=true;;
1160
				problem=true;
1161 1161
			}
1162 1162
		}
1163 1163
		if (dataHolder.nomenclatureCode.toString().equals("Bacterial")){

Also available in: Unified diff