Revision c59ecc4a
Added by Andreas Müller over 12 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java | ||
|---|---|---|
| 12 | 12 |
import java.io.File; |
| 13 | 13 |
import java.io.IOException; |
| 14 | 14 |
import java.net.MalformedURLException; |
| 15 |
import java.net.URI; |
|
| 16 | 15 |
import java.net.URL; |
| 17 | 16 |
import java.util.ArrayList; |
| 18 | 17 |
import java.util.HashMap; |
| 19 | 18 |
import java.util.List; |
| 20 | 19 |
import java.util.Map; |
| 21 |
import java.util.Set; |
|
| 22 | 20 |
import java.util.Map.Entry; |
| 21 |
import java.util.Set; |
|
| 23 | 22 |
|
| 24 | 23 |
import org.apache.log4j.Logger; |
| 25 | 24 |
import org.apache.sanselan.ImageInfo; |
| ... | ... | |
| 31 | 30 |
import org.springframework.stereotype.Component; |
| 32 | 31 |
|
| 33 | 32 |
import eu.etaxonomy.cdm.app.images.AbstractImageImporter; |
| 34 |
import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;
|
|
| 33 |
import eu.etaxonomy.cdm.app.images.ImageImportState;
|
|
| 35 | 34 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 36 | 35 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 37 | 36 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| ... | ... | |
| 166 | 165 |
|
| 167 | 166 |
|
| 168 | 167 |
|
| 169 |
protected boolean invokeImageImport (ImageImportConfigurator config){
|
|
| 168 |
protected void invokeImageImport (ImageImportState state){
|
|
| 170 | 169 |
|
| 171 |
logger.info("Importing images from directory: " + config.getSourceNameString());
|
|
| 170 |
logger.info("Importing images from directory: " + state.getConfig().getSourceNameString());
|
|
| 172 | 171 |
|
| 173 |
File sourceFolder = new File(config.getSource());
|
|
| 172 |
File sourceFolder = new File(state.getConfig().getSource());
|
|
| 174 | 173 |
String taxonName; |
| 175 | 174 |
if(sourceFolder.isDirectory()){
|
| 176 | 175 |
int count = 0; |
| ... | ... | |
| 193 | 192 |
|
| 194 | 193 |
|
| 195 | 194 |
|
| 196 |
Reference sec = referenceService.find(config.getSecUuid());
|
|
| 195 |
Reference sec = referenceService.find(state.getConfig().getSecUuid());
|
|
| 197 | 196 |
|
| 198 | 197 |
List<TaxonBase> taxa = new ArrayList<TaxonBase>(); |
| 199 | 198 |
if (taxonName != null){
|
| ... | ... | |
| 223 | 222 |
// URL for this image |
| 224 | 223 |
URL url = null; |
| 225 | 224 |
try {
|
| 226 |
url = new URL(config.getMediaUrlString() + file.getName());
|
|
| 225 |
url = new URL(state.getConfig().getMediaUrlString() + file.getName());
|
|
| 227 | 226 |
} catch (MalformedURLException e) {
|
| 228 | 227 |
logger.warn("URL is malformed: "+ url);
|
| 229 | 228 |
} |
| ... | ... | |
| 281 | 280 |
media.addRights(copyright); |
| 282 | 281 |
} |
| 283 | 282 |
|
| 284 |
Reference sourceRef = config.getSourceReference();
|
|
| 283 |
Reference sourceRef = state.getConfig().getSourceReference();
|
|
| 285 | 284 |
TaxonDescription description = taxon.getOrCreateImageGallery(sourceRef == null ? null :sourceRef.getTitleCache()); |
| 286 | 285 |
|
| 287 | 286 |
|
| ... | ... | |
| 312 | 311 |
}else{
|
| 313 | 312 |
logger.error("given source folder is not a directory");
|
| 314 | 313 |
} |
| 315 |
return true;
|
|
| 314 |
return; |
|
| 316 | 315 |
} |
| 317 | 316 |
|
| 318 | 317 |
private String getFirstName(String artist){
|
Also available in: Unified diff
last updates for Taxon Excel Import and moving all success variables to state