create association in fileset to the file #3842
Conversation
elrayle
force-pushed
the
wings/files_display
branch
from
a0166e8 to
51ca6b7
Compare
| @@ -76,10 +76,6 @@ def perform_ingest_file_through_active_fedora(io) | |||
|
|
|||
| def perform_ingest_file_through_valkyrie(io) | |||
| # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer. | |||
| storage_adapter = Valkyrie.config.storage_adapter | |||
There was a problem hiding this comment.
Moved to separate method to make rubocop happy about the method size.
| saved_node | ||
| pathhint = io.uploaded_file.uploader.path if io.uploaded_file # in case next worker is on same filesystem | ||
| id = Hyrax.config.translate_uri_to_id.call saved_node.file_identifiers.first | ||
| CharacterizeJob.perform_later(file_set, id, pathhint || io.path) |
There was a problem hiding this comment.
Perform characterization after creating the resource.
| @@ -45,14 +45,15 @@ def update | |||
|
|
|||
| # @param [RDF::URI] the identified use of the file (e.g. Valkyrie::Vocab::PCDMUse.OriginalFile, Valkyrie::Vocab::PCDMUse.ThumbnailImage, etc.) | |||
| # @param [true, false] update_existing when true, try to retrieve existing element before building one | |||
| def find_or_create_file(use, update_existing) | |||
There was a problem hiding this comment.
This code grabbed from Hydra::Works::AddFileToFileSet #find_or_create_file_for_rdf_uri does not work. It fails to create the #original_file association which is needed in other places in Hyrax (e.g. CharacterizeJob).
Switched to using the code from #find_or_create_file_for_symbol which requires that the URI passed in be converted to a symbol first.
| end | ||
|
|
||
| def association_type(use) | ||
| use.first.to_s.split('#').second.underscore.to_sym |
There was a problem hiding this comment.
Does the conversion from URI to symbol which allows the original_file association to be created.
This fixes some of the remaining issue for PR #3814. Specifically… * image is viewable on the work show page * thumbnail is shown in dashboard -> works * file will now download * characterization job completes Still need to write tests
elrayle
force-pushed
the
wings/files_display
branch
from
51ca6b7 to
8254ccb
Compare
| @@ -16,7 +16,7 @@ def initialize(storage_adapter:, persister:) | |||
|
|
|||
| # @param io_wrapper [JobIOWrapper] with details about the uploaded file | |||
| # @param node [FileNode] the metadata to represent the file | |||
| # @param file_set [Valkyrie::Resouce, Hydra::Works::FileSet] the associated FileSet # TODO: Remove Hydra::Works::FileSet as a potential type when valkyrization is complete. | |||
| # @param file_set [Valkyrie::Resouce, Hydra::Works::FileSet] the associated FileSet # TODO: WINGS - Remove Hydra::Works::FileSet as a potential type when valkyrization is complete. | |||
There was a problem hiding this comment.
Marking TODOs as WINGS related to make them easier to find and resolve.
| saved_node = file_set.is_a?(::Valkyrie::Resource) ? attach_file_node_to_valkyrie_file_set(node, file_set) : node | ||
|
|
||
| # note the returned saved_node does not yet contain the characterization done in the async job | ||
| CharacterizeJob.perform_later(saved_node.file_identifiers.first.to_s) # TODO: What id is the correct one for the file? Check where this is called outside of wings. |
There was a problem hiding this comment.
Removing this here. It wasn't working and is now done in the file_actor. The file_actor performs this when not working with Valkyrie, so it seems like a consistent place to do it when working with Valkyrie.
This fixes some of the remaining issue for PR #3814. Specifically…
Still need to write tests
Related to issue: Issue #3813
Created issue for Hydra::Works reporting the code that was originally copied that isn't working as expected...
samvera/hydra-works#369