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

NIHVIVO-1277 When uploading a file, store the alias URL on the FileByteStream resource.

Browse source
This commit is contained in:
jeb228 2010-10-29 20:27:42 +00:00
parent fcf0eb527f
commit a79b203a15
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
View file

@ -66,23 +66,24 @@ public class UploadedFileHelper {
} }
// Create the file individuals in the model // Create the file individuals in the model
Individual byteStream = createByteStreamIndividual(); Individual byteStream = createByteStreamIndividual(filename);
String bytestreamUri = byteStream.getURI(); String bytestreamUri = byteStream.getURI();
String aliasUrl = byteStream.getDataValue(VitroVocabulary.FS_ALIAS_URL);
Individual file = createFileIndividual(mimeType, filename, byteStream); Individual file = createFileIndividual(mimeType, filename, byteStream);
String fileUri = file.getURI(); String fileUri = file.getURI();
// Store the file in the FileStorage system. // Store the file in the FileStorage system.
fileStorage.createFile(bytestreamUri, filename, inputStream); fileStorage.createFile(bytestreamUri, filename, inputStream);
// Figure out the alias URL
String aliasUrl = FileServingHelper.getBytestreamAliasUrl(
bytestreamUri, filename);
// And wrap it all up in a tidy little package. // And wrap it all up in a tidy little package.
return new FileInfo.Builder().setFilename(filename) FileInfo.Builder builder = new FileInfo.Builder();
.setMimeType(mimeType).setUri(fileUri) builder.setFilename(filename);
.setBytestreamUri(bytestreamUri) builder.setMimeType(mimeType);
.setBytestreamAliasUrl(aliasUrl).build(); builder.setUri(fileUri);
builder.setBytestreamUri(bytestreamUri);
builder.setBytestreamAliasUrl(aliasUrl);
return builder.build();
} }
/** /**
@ -151,10 +152,10 @@ public class UploadedFileHelper {
} }
/** /**
* Create a bytestream individual in the model. It's just a naked individual * Create a bytestream individual in the model. The only property is the
* with no properties. * alias URL
*/ */
private Individual createByteStreamIndividual() { private Individual createByteStreamIndividual(String filename) {
Individual byteStream = new IndividualImpl(); Individual byteStream = new IndividualImpl();
byteStream.setVClassURI(VitroVocabulary.FS_BYTESTREAM_CLASS); byteStream.setVClassURI(VitroVocabulary.FS_BYTESTREAM_CLASS);
@ -166,6 +167,11 @@ public class UploadedFileHelper {
"Failed to create the bytestream individual.", e); "Failed to create the bytestream individual.", e);
} }
dataPropertyStatementDao
.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
uri, VitroVocabulary.FS_ALIAS_URL, FileServingHelper
.getBytestreamAliasUrl(uri, filename)));
return individualDao.getIndividualByURI(uri); return individualDao.getIndividualByURI(uri);
} }