Project

General

Profile

« Previous | Next » 

Revision 401fe405

Added by Andreas Müller over 13 years ago

merge cdmlib-app-3.0.2 to trunk (app-import)

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java
44 44
import eu.etaxonomy.cdm.model.media.MediaRepresentation;
45 45
import eu.etaxonomy.cdm.model.media.Rights;
46 46
import eu.etaxonomy.cdm.model.media.RightsTerm;
47
import eu.etaxonomy.cdm.model.reference.ReferenceBase;
47
import eu.etaxonomy.cdm.model.reference.Reference;
48 48
import eu.etaxonomy.cdm.model.taxon.Taxon;
49 49
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
50 50
import eu.etaxonomy.cdm.strategy.match.DefaultMatchStrategy;
......
193 193
					
194 194
					
195 195
					
196
					ReferenceBase sec = referenceService.find(config.getSecUuid());
196
					Reference sec = referenceService.find(config.getSecUuid());
197 197

  
198 198
					List<TaxonBase> taxa = new ArrayList<TaxonBase>();
199 199
					if (taxonName != null){
......
229 229
						}
230 230
						
231 231
						
232
						ImageFile imageFile = ImageFile.NewInstance(url.toString(),null, imageinfo.getHeight(), imageinfo.getWidth());
232
						ImageFile imageFile = ImageFile.NewInstance(url.toURI(),null, imageinfo.getHeight(), imageinfo.getWidth());
233 233
						
234 234
						
235 235
						MediaRepresentation representation = MediaRepresentation.NewInstance(mimeType, suffix);
......
281 281
							media.addRights(copyright);
282 282
						}
283 283
						
284
						ReferenceBase sourceRef = config.getSourceReference();
284
						Reference sourceRef = config.getSourceReference();
285 285
						TaxonDescription description = taxon.getOrCreateImageGallery(sourceRef == null ? null :sourceRef.getTitleCache());
286 286
						
287 287
						

Also available in: Unified diff