litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3654 Add more error checking for invalid RDF on the image.

Browse source
This commit is contained in:
j2blake 2012-07-01 17:29:24 +00:00
parent 088b26cf84
commit c39790aed9
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
View file

@ -94,6 +94,7 @@ public class FileInfo {
String filename = surrogate.getDataValue(VitroVocabulary.FS_FILENAME);
if (filename == null) {
log.error("File had no filename: '" + uri + "'");
return null;
} else {
log.debug("Filename for '" + uri + "' was '" + filename + "'");
}
@ -101,6 +102,7 @@ public class FileInfo {
String mimeType = surrogate.getDataValue(VitroVocabulary.FS_MIME_TYPE);
if (mimeType == null) {
log.error("File had no mimeType: '" + uri + "'");
return null;
} else {
log.debug("mimeType for '" + uri + "' was '" + mimeType + "'");
}
@ -110,10 +112,21 @@ public class FileInfo {
if (byteStream == null) {
log.error("File surrogate '" + uri
+ "' had no associated bytestream.");
return null;
}
String bytestreamUri = findBytestreamUri(byteStream, uri);
if (bytestreamUri == null) {
log.error("Bytestream of file surrogate '" + uri + "' had no URI: "
+ byteStream);
return null;
}
String bytestreamAliasUrl = findBytestreamAliasUrl(byteStream, uri);
if (bytestreamAliasUrl == null) {
log.error("Bytestream '" + bytestreamUri + "' had no alias URL.");
return null;
}
return new FileInfo.Builder().setUri(uri).setFilename(filename)
.setMimeType(mimeType).setBytestreamUri(bytestreamUri)