diff --git a/bin/docker-start b/bin/docker-start index 6bd61e787d..420c646491 100755 --- a/bin/docker-start +++ b/bin/docker-start @@ -18,8 +18,15 @@ export HOME=/home/app yarn config set -- --modules-folder "/home/app/node_modules" yarn install +apt-get clean && rm -rf /var/lib/apt/lists/; +apt-get update +apt-cache search yaz; +apt-get install -y yaz libyaz4 libyaz4-dev; +#yaz-config --help +# cat /usr/local/bundle/extensions/x86_64-linux/2.5.0/zoom-0.5.0/gem_make.out + bundle config build.nokogiri --use-system-libraries && \ -bundle install --path=/home/app/gems --with mysql aws test +bundle install --path=/home/app/gems --with mysql aws test zoom bundle exec rake db:create diff --git a/docker-compose.yml b/docker-compose.yml index 11cad1cb84..e642834a7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,6 +96,13 @@ services: - DATABASE_URL=mysql2://root:mysecretpassword@db:3306/ - SETTINGS__DROPBOX__PATH=/masterfiles - SETTINGS__DROPBOX__UPLOAD_URI=./masterfiles + - SETTINGS__BIB_RETRIEVER__PROTOCOL=z39.50 + - SETTINGS__BIB_RETRIEVER__HOST= + - SETTINGS__BIB_RETRIEVER__PORT=2200 + - SETTINGS__BIB_RETRIEVER__DATABASE=Unicorn + - SETTINGS__BIB_RETRIEVER__ATTRIBUTE=12 + - SETTINGS__BIB_RETRIEVER__RETRIEVER_CLASS=Avalon::BibRetriever::Zoom + - SETTINGS__BIB_RETRIEVER__RETRIEVER_CLASS_REQUIRE=avalon/bib_retriever/zoom - EMAIL_COMMENTS - EMAIL_NOTIFICATION - EMAIL_SUPPORT diff --git a/lib/avalon/batch/entry.rb b/lib/avalon/batch/entry.rb index 373a7c66ea..5b9057e4a0 100644 --- a/lib/avalon/batch/entry.rb +++ b/lib/avalon/batch/entry.rb @@ -47,7 +47,7 @@ def media_object end # Sometimes we want to override the bib import data for some of the # required fields (particularly if import data doesn't pass validations) - mo.assign_attributes(fields.slice(:language, :topical_subject, :genre)) + mo.assign_attributes(fields.slice(:language, :topical_subject, :genre, :terms_of_use)) else begin mo.assign_attributes(media_object_fields)