Skip to content

Fixed #5340 delete auxiliary objects in Swift #5356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 1 commit into from
Dec 18, 2018
Merged

Fixed #5340 delete auxiliary objects in Swift #5356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,17 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
Properties p = getSwiftProperties();
swiftEndPoint = p.getProperty("swift.default.endpoint");

// Swift uses this to create pseudo-hierarchical folders
String swiftPseudoFolderPathSeparator = "/";

//swiftFolderPath = dataFile.getOwner().getDisplayName();
String swiftFolderPathSeparator = "-";
String authorityNoSlashes = owner.getAuthority().replace("/", swiftFolderPathSeparator);
swiftFolderPath = owner.getProtocolForFileStorage() + swiftFolderPathSeparator
+ authorityNoSlashes.replace(".", swiftFolderPathSeparator)
+ swiftFolderPathSeparator + owner.getIdentifierForFileStorage();
swiftFileName = storageIdentifier;
+ authorityNoSlashes.replace(".", swiftFolderPathSeparator);

swiftFileName = owner.getIdentifierForFileStorage() + swiftPseudoFolderPathSeparator
+ storageIdentifier;
//setSwiftContainerName(swiftFolderPath);
//swiftFileName = dataFile.getDisplayName();
//Storage Identifier is now updated after the object is uploaded on Swift.
Expand Down Expand Up @@ -569,10 +573,14 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
Properties p = getSwiftProperties();
swiftEndPoint = p.getProperty("swift.default.endpoint");
String swiftFolderPathSeparator = "-";

// Swift uses this to create pseudo-hierarchical folders
String swiftPseudoFolderPathSeparator = "/";

String authorityNoSlashes = dataset.getAuthorityForFileStorage().replace("/", swiftFolderPathSeparator);
swiftFolderPath = dataset.getProtocolForFileStorage() + swiftFolderPathSeparator +
authorityNoSlashes.replace(".", swiftFolderPathSeparator) +
swiftFolderPathSeparator + dataset.getIdentifierForFileStorage();
swiftPseudoFolderPathSeparator + dataset.getIdentifierForFileStorage();

swiftFileName = auxItemTag;
dvObject.setStorageIdentifier("swift://" + swiftEndPoint + ":" + swiftFolderPath);
Expand Down