Revision 92fdeae1
Added by Andreas Müller almost 4 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java | ||
|---|---|---|
| 39 | 39 |
import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator; |
| 40 | 40 |
import eu.etaxonomy.cdm.app.common.CdmDestinations; |
| 41 | 41 |
import eu.etaxonomy.cdm.common.UTF8; |
| 42 |
import eu.etaxonomy.cdm.common.media.ImageInfo; |
|
| 42 |
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
|
|
| 43 | 43 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 44 | 44 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 45 | 45 |
import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController; |
| ... | ... | |
| 462 | 462 |
media.addRepresentation(representation); |
| 463 | 463 |
|
| 464 | 464 |
if (uriStrThumb != null){
|
| 465 |
ImageInfo imageInfoThumb = null; |
|
| 465 |
CdmImageInfo imageInfoThumb = null;
|
|
| 466 | 466 |
uriStrThumb = uriStrThumb.replace(" ", "%20"); //replace whitespace
|
| 467 | 467 |
URI uriThumb = new URI(uriStrThumb); |
| 468 | 468 |
try {
|
| 469 | 469 |
if (readMediaData){
|
| 470 | 470 |
logger.info("Read media data from: " + uriThumb);
|
| 471 |
imageInfoThumb = ImageInfo.NewInstance(uriThumb, 0); |
|
| 471 |
imageInfoThumb = CdmImageInfo.NewInstance(uriThumb, 0);
|
|
| 472 | 472 |
} |
| 473 | 473 |
} catch (Exception e) {
|
| 474 | 474 |
String message = "An error occurred when trying to read image meta data for " + uriThumb.toString() + ": " + e.getMessage(); |
| ... | ... | |
| 497 | 497 |
private MediaRepresentation makeMediaRepresentation(String uriString, boolean readMediaData) {
|
| 498 | 498 |
|
| 499 | 499 |
uriString = uriString.replace(" ", "%20"); //replace whitespace
|
| 500 |
ImageInfo imageInfo = null; |
|
| 500 |
CdmImageInfo imageInfo = null;
|
|
| 501 | 501 |
URI uri; |
| 502 | 502 |
try {
|
| 503 | 503 |
uri = new URI(uriString); |
| ... | ... | |
| 508 | 508 |
try {
|
| 509 | 509 |
if (readMediaData){
|
| 510 | 510 |
logger.info("Read media data from: " + uri);
|
| 511 |
imageInfo = ImageInfo.NewInstance(uri, 0); |
|
| 511 |
imageInfo = CdmImageInfo.NewInstance(uri, 0);
|
|
| 512 | 512 |
} |
| 513 | 513 |
} catch (Exception e) {
|
| 514 | 514 |
try {
|
| 515 | 515 |
//try again |
| 516 |
imageInfo = ImageInfo.NewInstance(uri, 0); |
|
| 516 |
imageInfo = CdmImageInfo.NewInstance(uri, 0);
|
|
| 517 | 517 |
} catch (Exception e1) {
|
| 518 | 518 |
String message = "An error occurred when trying to read image meta data for " + uri.toString() + ": " + e1.getMessage(); |
| 519 | 519 |
e1.printStackTrace(); |
Also available in: Unified diff
rename ImageInfo to CdmImageInfo and replace CdmUtils.str2uri