diff --git a/.travis.yml b/.travis.yml index 12087ce..f225e3f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ sudo: true -dist: trusty language: php php: - 7.2 @@ -19,19 +18,21 @@ branches: - /master/ before_install: - - export SCRIPT_DIR=$HOME/CLAW/.scripts + - export SCRIPT_DIR=$HOME/islandora/.scripts - export DRUPAL_DIR=/opt/drupal - export COMPOSER_PATH="/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/bin/composer" install: - - git clone https://github.com/Islandora-CLAW/CLAW.git $HOME/CLAW + - git clone https://github.com/Islandora/documentation.git $HOME/islandora - $SCRIPT_DIR/travis_setup_drupal.sh - git -C "$TRAVIS_BUILD_DIR" checkout -b travis-testing - cd $DRUPAL_DIR; - COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 $COMPOSER_PATH config repositories.local path "$TRAVIS_BUILD_DIR" - COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 $COMPOSER_PATH require "drupal/search_api_solr:^2.7" + - $COMPOSER_PATH clearcache - COMPOSER_MEMORY_LIMIT=-1 php -d memory_limit=-1 $COMPOSER_PATH require "islandora/islandora_defaults:dev-travis-testing as dev-8.x-1.x" --prefer-source --update-with-dependencies - cd web; + - ls modules/contrib/islandora/modules/islandora_core_feature/config/install/; - (drush -y --uri=127.0.0.1:8282 en islandora_core_feature; drush -y --uri=127.0.0.1:8282 fim islandora_core_feature) - (drush -y --uri=127.0.0.1:8282 en islandora_defaults; drush -y --uri=127.0.0.1:8282 entity:updates; drush -y --uri=127.0.0.1:8282 pmu islandora_defaults; drush -y --uri=127.0.0.1:8282 en islandora_defaults) - drush -y --uri=127.0.0.1:8282 fim islandora_defaults @@ -42,11 +43,3 @@ script: - phpcs --standard=Drupal --ignore=*.md --extensions=php,module,inc,install,test,profile,theme,css,info $TRAVIS_BUILD_DIR - phpcpd --names *.module,*.inc,*.test,*.php $TRAVIS_BUILD_DIR # - php core/scripts/run-tests.sh --suppress-deprecations --url http://127.0.0.1:8282 --verbose --php `which php` --module "islandora_defaults" - -notifications: - irc: - channels: - - "irc.freenode.org#islandora" - on_success: change - on_failure: always - skip_join: true diff --git a/config/install/core.entity_form_display.media.audio.default.yml b/config/install/core.entity_form_display.media.audio.default.yml index c304b36..c933971 100644 --- a/config/install/core.entity_form_display.media.audio.default.yml +++ b/config/install/core.entity_form_display.media.audio.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.audio.field_media_of - field.field.media.audio.field_media_use - field.field.media.audio.field_mime_type + - field.field.media.audio.field_original_name - media.type.audio module: - file @@ -51,6 +52,14 @@ content: region: content settings: { } third_party_settings: { } + field_original_name: + weight: 26 + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + type: string_textarea + region: content name: type: string_textfield weight: 0 diff --git a/config/install/core.entity_form_display.media.file.default.yml b/config/install/core.entity_form_display.media.file.default.yml index 561fcd4..a14f02c 100644 --- a/config/install/core.entity_form_display.media.file.default.yml +++ b/config/install/core.entity_form_display.media.file.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.file.field_media_of - field.field.media.file.field_media_use - field.field.media.file.field_mime_type + - field.field.media.file.field_original_name - media.type.file module: - file @@ -51,6 +52,14 @@ content: region: content settings: { } third_party_settings: { } + field_original_name: + weight: 26 + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + type: string_textarea + region: content name: type: string_textfield weight: 0 diff --git a/config/install/core.entity_form_display.media.image.default.yml b/config/install/core.entity_form_display.media.image.default.yml index e950879..0f5aa00 100644 --- a/config/install/core.entity_form_display.media.image.default.yml +++ b/config/install/core.entity_form_display.media.image.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.media.image.field_media_of - field.field.media.image.field_media_use - field.field.media.image.field_mime_type + - field.field.media.image.field_original_name - field.field.media.image.field_width - image.style.thumbnail - media.type.image @@ -55,6 +56,14 @@ content: region: content settings: { } third_party_settings: { } + field_original_name: + weight: 26 + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + type: string_textarea + region: content name: type: string_textfield weight: 0 diff --git a/config/install/core.entity_form_display.media.video.default.yml b/config/install/core.entity_form_display.media.video.default.yml index 57675e5..3826ba8 100644 --- a/config/install/core.entity_form_display.media.video.default.yml +++ b/config/install/core.entity_form_display.media.video.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.video.field_media_use - field.field.media.video.field_media_video_file - field.field.media.video.field_mime_type + - field.field.media.video.field_original_name - media.type.video module: - file @@ -51,6 +52,14 @@ content: third_party_settings: { } type: file_generic region: content + field_original_name: + weight: 26 + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + type: string_textarea + region: content name: type: string_textfield weight: 0 diff --git a/config/install/core.entity_view_display.media.audio.default.yml b/config/install/core.entity_view_display.media.audio.default.yml index 8d5aba3..6d1344d 100644 --- a/config/install/core.entity_view_display.media.audio.default.yml +++ b/config/install/core.entity_view_display.media.audio.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.audio.field_media_of - field.field.media.audio.field_media_use - field.field.media.audio.field_mime_type + - field.field.media.audio.field_original_name - media.type.audio module: - file @@ -33,6 +34,11 @@ content: thousand_separator: '' prefix_suffix: true third_party_settings: { } + field_gemini_uri: + weight: 100 + settings: { } + third_party_settings: { } + region: content field_media_audio_file: type: file_audio weight: 1 @@ -68,6 +74,13 @@ content: settings: link_to_entity: false third_party_settings: { } + field_original_name: + weight: 101 + label: above + settings: { } + third_party_settings: { } + type: basic_string + region: content name: type: string weight: 0 diff --git a/config/install/core.entity_view_display.media.file.default.yml b/config/install/core.entity_view_display.media.file.default.yml index 4eb735e..4b5013f 100644 --- a/config/install/core.entity_view_display.media.file.default.yml +++ b/config/install/core.entity_view_display.media.file.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.file.field_media_of - field.field.media.file.field_media_use - field.field.media.file.field_mime_type + - field.field.media.file.field_original_name - media.type.file module: - file @@ -33,6 +34,11 @@ content: thousand_separator: '' prefix_suffix: true third_party_settings: { } + field_gemini_uri: + weight: 100 + settings: { } + third_party_settings: { } + region: content field_media_file: label: visually_hidden settings: @@ -65,6 +71,13 @@ content: settings: link_to_entity: false third_party_settings: { } + field_original_name: + weight: 101 + label: above + settings: { } + third_party_settings: { } + type: basic_string + region: content name: type: string weight: 0 diff --git a/config/install/core.entity_view_display.media.image.default.yml b/config/install/core.entity_view_display.media.image.default.yml index baf8595..93520cf 100644 --- a/config/install/core.entity_view_display.media.image.default.yml +++ b/config/install/core.entity_view_display.media.image.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.media.image.field_media_of - field.field.media.image.field_media_use - field.field.media.image.field_mime_type + - field.field.media.image.field_original_name - field.field.media.image.field_width - media.type.image module: @@ -35,6 +36,11 @@ content: thousand_separator: '' prefix_suffix: true third_party_settings: { } + field_gemini_uri: + weight: 100 + settings: { } + third_party_settings: { } + region: content field_height: type: number_integer weight: 5 @@ -77,6 +83,13 @@ content: settings: link_to_entity: false third_party_settings: { } + field_original_name: + weight: 101 + label: above + settings: { } + third_party_settings: { } + type: basic_string + region: content field_width: type: number_integer weight: 4 diff --git a/config/install/core.entity_view_display.media.video.default.yml b/config/install/core.entity_view_display.media.video.default.yml index 1dae349..c12b534 100644 --- a/config/install/core.entity_view_display.media.video.default.yml +++ b/config/install/core.entity_view_display.media.video.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.media.video.field_media_use - field.field.media.video.field_media_video_file - field.field.media.video.field_mime_type + - field.field.media.video.field_original_name - media.type.video module: - file @@ -33,6 +34,11 @@ content: thousand_separator: '' prefix_suffix: true third_party_settings: { } + field_gemini_uri: + weight: 100 + settings: { } + third_party_settings: { } + region: content field_media_of: type: entity_reference_label weight: 4 @@ -71,6 +77,13 @@ content: settings: link_to_entity: false third_party_settings: { } + field_original_name: + weight: 101 + label: above + settings: { } + third_party_settings: { } + type: basic_string + region: content name: type: string weight: 0 diff --git a/config/install/field.field.media.audio.field_original_name.yml b/config/install/field.field.media.audio.field_original_name.yml new file mode 100644 index 0000000..d4b88e8 --- /dev/null +++ b/config/install/field.field.media.audio.field_original_name.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_original_name + - media.type.audio +id: media.audio.field_original_name +field_name: field_original_name +entity_type: media +bundle: audio +label: 'Original Name' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/install/field.field.media.file.field_original_name.yml b/config/install/field.field.media.file.field_original_name.yml new file mode 100644 index 0000000..6a753ee --- /dev/null +++ b/config/install/field.field.media.file.field_original_name.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_original_name + - media.type.file +id: media.file.field_original_name +field_name: field_original_name +entity_type: media +bundle: file +label: 'Original Name' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/install/field.field.media.image.field_original_name.yml b/config/install/field.field.media.image.field_original_name.yml new file mode 100644 index 0000000..97bb27f --- /dev/null +++ b/config/install/field.field.media.image.field_original_name.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_original_name + - media.type.image +id: media.image.field_original_name +field_name: field_original_name +entity_type: media +bundle: image +label: 'Original Name' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/install/field.field.media.video.field_original_name.yml b/config/install/field.field.media.video.field_original_name.yml new file mode 100644 index 0000000..7a8ab07 --- /dev/null +++ b/config/install/field.field.media.video.field_original_name.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_original_name + - media.type.video +id: media.video.field_original_name +field_name: field_original_name +entity_type: media +bundle: video +label: 'Original Name' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/install/rdf.mapping.media.audio.yml b/config/install/rdf.mapping.media.audio.yml index bd2f291..0f6a326 100644 --- a/config/install/rdf.mapping.media.audio.yml +++ b/config/install/rdf.mapping.media.audio.yml @@ -39,6 +39,9 @@ fieldMappings: properties: - 'pcdm:fileOf' mapping_type: rel + field_original_name: + properties: + - 'premis3:originalName' field_tags: properties: - 'schema:additionalType' diff --git a/config/install/rdf.mapping.media.file.yml b/config/install/rdf.mapping.media.file.yml index 84d72d8..5dfae85 100644 --- a/config/install/rdf.mapping.media.file.yml +++ b/config/install/rdf.mapping.media.file.yml @@ -39,6 +39,9 @@ fieldMappings: properties: - 'pcdm:fileOf' mapping_type: rel + field_original_name: + properties: + - 'premis3:originalName' field_tags: properties: - 'schema:additionalType' diff --git a/config/install/rdf.mapping.media.image.yml b/config/install/rdf.mapping.media.image.yml index a4f7160..b105591 100644 --- a/config/install/rdf.mapping.media.image.yml +++ b/config/install/rdf.mapping.media.image.yml @@ -39,6 +39,9 @@ fieldMappings: properties: - 'pcdm:fileOf' mapping_type: rel + field_original_name: + properties: + - 'premis3:originalName' field_tags: properties: - 'schema:additionalType' diff --git a/config/install/rdf.mapping.media.video.yml b/config/install/rdf.mapping.media.video.yml index 2cb8c47..63e60c0 100644 --- a/config/install/rdf.mapping.media.video.yml +++ b/config/install/rdf.mapping.media.video.yml @@ -39,6 +39,9 @@ fieldMappings: properties: - 'pcdm:fileOf' mapping_type: rel + field_original_name: + properties: + - 'premis3:originalName' field_tags: properties: - 'schema:additionalType' diff --git a/config/install/rdf.mapping.node.islandora_object.yml b/config/install/rdf.mapping.node.islandora_object.yml old mode 100755 new mode 100644