Skip to content

Commit

Permalink
Merge pull request #517 from sul-dlss/add-3d-content-type-legacy
Browse files Browse the repository at this point in the history
adds 3d support for v3-legacy accessioning
  • Loading branch information
ndushay committed Aug 14, 2019
2 parents 60d543c + 02624d1 commit 6bee58c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'honeybadger', '~> 3.1'

# Stanford gems
gem 'assembly-image'
gem 'assembly-objectfile', '> 1.6.6'
gem 'assembly-objectfile', '>= 1.7.2' # 1.7.2 is the first version to support 3d content metadata generation
gem 'assembly-utils'
gem 'dir_validator'
# gem 'dor-fetcher' # not supported anymore; only used by devel/get_dor_and_sdr_versions.rb script, which is not regularly used
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ GEM
tzinfo (~> 1.1)
airbrussh (1.3.2)
sshkit (>= 1.6.1, != 1.7.0)
assembly-image (1.7.5)
assembly-image (1.7.6)
assembly-objectfile (>= 1.6.4)
mini_exiftool (>= 1.6, < 3)
assembly-objectfile (1.7.1)
mime-types
assembly-objectfile (1.7.2)
mime-types (> 3)
mini_exiftool
nokogiri
assembly-utils (1.5.0)
Expand Down Expand Up @@ -369,7 +369,7 @@ DEPENDENCIES
actionmailer (~> 4.2.10)
actionpack (~> 4.2.10)
assembly-image
assembly-objectfile (> 1.6.6)
assembly-objectfile (>= 1.7.2)
assembly-utils
awesome_print
byebug
Expand Down Expand Up @@ -402,4 +402,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.0.2
2.0.1
2 changes: 2 additions & 0 deletions config/projects/TEMPLATE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ project_style:
'book_as_image' # Like simple_book, but with <contentMetadata type="book"> and <resource type="image"> instead of "page".

'smpl' # Used for SMPL projects

'3d' # Used for 3d objects

content_tag_override: false # DEFAULT if not supplied -- content_structure as defined above is always used even if the object is registered with a content type tag
true # if set to true; then content_structure type is deteremined from registered object content type tag using mappings defined in pre-assembly if possible;
Expand Down
2 changes: 1 addition & 1 deletion lib/pre_assembly/bundle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def load_skippables
def allowed_values
{
:project_style=>{
:content_structure=>[:simple_image,:simple_book,:book_as_image,:book_with_pdf,:file,:smpl],
:content_structure=>[:simple_image,:simple_book,:book_as_image,:book_with_pdf,:file,:smpl,:'3d'],
:get_druid_from=>[:suri,:container,:container_barcode,:manifest,:druid_minter],
},
:content_md_creation=>{
Expand Down

0 comments on commit 6bee58c

Please sign in to comment.