From 66c58a3bf56022c1045ea2594c10baa2770e8e1f Mon Sep 17 00:00:00 2001 From: JenDiamond Date: Thu, 6 Aug 2020 13:31:33 -0700 Subject: [PATCH] CAL-929-930-931-933 Add metadata fields (#835) * CAL-929 Add metadata field for "Illustrator" Connected to[CAL-929](https://jira.library.ucla.edu/browse/CAL-929) --- 1. `app/controllers/catalog_controller.rb` 1. `app/forms/hyrax/californica_collections_form.rb` 1. `app/forms/hyrax/work_form.rb` 1. `app/importers/californica_mapper.rb` 1. `app/models/solr_document.rb` 1. `app/models/ucla_metadata.rb` 1. `app/presenters/hyrax/californica_collection_presenter.rb` 1. `app/presenters/hyrax/work_presenter.rb` 1. `app/views/hyrax/base/_attribute_rows.html.erb` 1. `solr/config/solrconfig.xml` 1. `spec/fixtures/coordinates_example.csv` 1. `spec/fixtures/coordinates_example_update.csv` 1. `spec/fixtures/csv_import/good/all_fields.csv` 1. `spec/fixtures/example.csv` 1. `spec/fixtures/simple_example.csv` 1. `spec/forms/hyrax/work_form_spec.rb` 1. `spec/importers/californica_csv_parser_spec.rb` 1. `spec/importers/californica_mapper_spec.rb` 1. `spec/system/edit_collection_spec.rb` 1. `spec/system/edit_work_spec.rb` 1. `spec/system/import_and_show_work_spec.rb` 1. `spec/system/show_collection_spec.rb` 1. `spec/uploaders/csv_manifest_validator_spec.rb` 1. `spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb` * Fix edit_work_spec * Update coordinates_example csv * Update expectation import_and_show_work_spec * Add metadata fields CAL 929 930 931 933 Changes to be committed: modified: app/assets/csv/import_manifest.csv modified: app/assets/markdown/importer_guide.md modified: app/controllers/catalog_controller.rb modified: app/forms/hyrax/californica_collections_form.rb modified: app/forms/hyrax/work_form.rb modified: app/importers/californica_mapper.rb modified: app/models/solr_document.rb modified: app/models/ucla_metadata.rb modified: app/presenters/hyrax/californica_collection_presenter.rb modified: app/presenters/hyrax/work_presenter.rb modified: app/views/hyrax/base/_attribute_rows.html.erb modified: spec/fixtures/coordinates_example.csv modified: spec/fixtures/coordinates_example_update.csv modified: spec/fixtures/csv_import/good/all_fields.csv modified: spec/fixtures/example.csv modified: spec/fixtures/simple_example.csv modified: spec/forms/hyrax/work_form_spec.rb modified: spec/importers/californica_csv_parser_spec.rb modified: spec/importers/californica_mapper_spec.rb modified: spec/system/edit_collection_spec.rb modified: spec/system/edit_work_spec.rb modified: spec/system/import_and_show_work_spec.rb modified: spec/system/show_collection_spec.rb modified: spec/uploaders/csv_manifest_validator_spec.rb modified: spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb * Fix csv errors * Fix edit_collection * Fix edit_work_spec * Fix edit_work_spec2 * Fix rubocop offenses * Fix all_fields csv Co-authored-by: parinita --- app/assets/csv/import_manifest.csv | 2 +- app/assets/markdown/importer_guide.md | 23 ++++ app/controllers/catalog_controller.rb | 5 + .../hyrax/californica_collections_form.rb | 10 ++ app/forms/hyrax/work_form.rb | 5 + app/importers/californica_mapper.rb | 5 + app/models/solr_document.rb | 64 ++++++--- app/models/ucla_metadata.rb | 78 +++++++---- .../hyrax/californica_collection_presenter.rb | 5 + app/presenters/hyrax/work_presenter.rb | 5 + app/views/hyrax/base/_attribute_rows.html.erb | 5 + spec/fixtures/coordinates_example.csv | 4 +- spec/fixtures/coordinates_example_update.csv | 4 +- spec/fixtures/csv_import/good/all_fields.csv | 6 +- spec/fixtures/example.csv | 4 +- spec/fixtures/simple_example.csv | 4 +- spec/forms/hyrax/work_form_spec.rb | 5 + spec/importers/californica_csv_parser_spec.rb | 11 +- spec/importers/californica_mapper_spec.rb | 18 ++- spec/system/edit_collection_spec.rb | 12 +- spec/system/edit_work_spec.rb | 5 + spec/system/import_and_show_work_spec.rb | 15 ++- spec/system/show_collection_spec.rb | 5 + spec/uploaders/csv_manifest_validator_spec.rb | 11 +- .../base/_attribute_rows.html.erb_spec.rb | 125 +++++++++++------- 25 files changed, 318 insertions(+), 118 deletions(-) diff --git a/app/assets/csv/import_manifest.csv b/app/assets/csv/import_manifest.csv index 1bf28d47..66c0b456 100644 --- a/app/assets/csv/import_manifest.csv +++ b/app/assets/csv/import_manifest.csv @@ -1 +1 @@ -Object Type,Title,Item ARK,Parent ARK,Rights.copyrightStatus,File Name,AltIdentifier.local,AltTitle.other,Binding note,Condition note,Coverage.geographic,Date.creation,Date.normalized,Description.caption,Description.fundingNote,Description.latitude,Description.longitude,Description.note,Format.dimensions,Format.extent,Format.medium,Language,Name.architect,Name.photographer,Name.repository,Name.subject,Name.repository,Opac url,Project Name,Publisher.publisherName,Relation.isPartOf,Rights.countryCreation,Rights.rightsHolderContact,Rights.statementLocal,Subject,Type.genre,Type.typeOfResource,Place of origin,AltTitle.uniform,Support,Summary,Page layout,Text direction,viewingHint,IIIF Range,Illustrations note,Provenance; Description.history,Table of Contents; Description.tableOfContents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Masthead,Representative image,Featured image,Tagline,Subject geographic,Subject temporal,Translator,Name.translator,Commentator,Name.commentator,Colophon,Finding Aid URL, Alt ID.url, Rubricator,Name.rubricator,License,Illustrator,Name.illustrator +Object Type,Title,Item ARK,Parent ARK,Rights.copyrightStatus,File Name,AltIdentifier.local,AltTitle.other,Binding note,Condition note,Coverage.geographic,Date.creation,Date.normalized,Description.caption,Description.fundingNote,Description.latitude,Description.longitude,Description.note,Format.dimensions,Format.extent,Format.medium,Language,Name.architect,Name.photographer,Name.repository,Name.subject,Name.repository,Opac url,Project Name,Publisher.publisherName,Relation.isPartOf,Rights.countryCreation,Rights.rightsHolderContact,Rights.statementLocal,Subject,Type.genre,Type.typeOfResource,Place of origin,AltTitle.uniform,Support,Summary,Page layout,Text direction,viewingHint,IIIF Range,Illustrations note,Provenance; Description.history,Table of Contents; Description.tableOfContents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Masthead,Representative image,Featured image,Tagline,Subject geographic,Subject temporal,Translator,Name.translator,Commentator,Name.commentator,Colophon,Finding Aid URL, Alt ID.url, Rubricator,Name.rubricator,License,Illustrator,Name.illustrator,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker diff --git a/app/assets/markdown/importer_guide.md b/app/assets/markdown/importer_guide.md index fa34d682..772d73c8 100644 --- a/app/assets/markdown/importer_guide.md +++ b/app/assets/markdown/importer_guide.md @@ -14,6 +14,7 @@ - [AltTitle.uniform](#alttitle.uniform) - [Author](#author) - [Binding note](#binding_note) +- [Calligrapher](# calligrapher) - [Collation](#collation) - [Colophon](#colophon) - [Commentator](#commentator) @@ -26,6 +27,8 @@ - [Description.latitude](#description.latitude) - [Description.longitude](#description.longitude) - [Description.note](#description.note) +- [Editor](# editor) +- [Engraver](# engraver) - [Foliation](#foliation) - [Featured image](#featured_image) - [Finding Aid Url](#finding-aid-url)creator @@ -50,8 +53,10 @@ - [Name.repository](#name.repository) - [Name.scribe](#name.scribe) - [Name.subject](#name.subject) +- [Note](#note) - [Opac url](#opac_url) - [Page layout](#page-layout) +- [Printmaker](# printmaker) - [Project Name](#project-name) - [Place of origin](#place-of-origin) - [Provenance](#provenance) @@ -175,6 +180,10 @@ Also accepts: `AltTitle.translated`, `AltTitle.descriptive` Also accepts: `Description.binding` +### Calligrapher + +Also accepts Name.calligrapher + ### Collation ### Colophon @@ -205,6 +214,14 @@ Also accepts: `Description.condition` ### Description.note +### Editor + +Also accepts Name.editor + +### Engraver + +Also accepts Name.engraver + ### Featured image ### Finding Aid URL @@ -259,6 +276,8 @@ accepts ""Illustrator", "Name.illustrator" ### Name.photographer +### Note + ### Repository Also accepts: `Name.repository` @@ -273,6 +292,10 @@ Also accepts: `Description.opac` ### Place of origin +### Printmaker + +Also accepts Name.printmaker + ### Project Name ### Provenance diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 001f2106..fc0da056 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -105,6 +105,7 @@ def self.modified_field config.add_show_field 'alternative_title_tesim' config.add_show_field 'architect_tesim' config.add_show_field 'author_tesim' + config.add_show_field 'calligrapher_tesim' config.add_show_field 'caption_tesim' config.add_show_field 'collation_ssi' config.add_show_field 'colophon_tesim' @@ -113,6 +114,8 @@ def self.modified_field config.add_show_field 'condition_note_ssi' config.add_show_field 'binding_note_ssi' config.add_show_field 'dimensions_tesim' + config.add_show_field 'editor_tesim' + config.add_show_field 'engraver_tesim' config.add_show_field 'extent_tesim' config.add_show_field 'finding_aid_url_ssm' config.add_show_field 'foliation_ssi', label: 'Foliation note' @@ -131,11 +134,13 @@ def self.modified_field config.add_show_field 'medium_tesim' config.add_show_field 'named_subject_tesim' config.add_show_field 'normalized_date_tesim' + config.add_show_field 'note_tesim' config.add_show_field 'opac_url_ssi' config.add_show_field 'page_layout_ssim' config.add_show_field 'photographer_tesim' config.add_show_field 'place_of_origin_tesim' config.add_show_field 'preservation_copy_ssi' + config.add_show_field 'printmaker_tesim' config.add_show_field 'provenance_tesim' config.add_show_field 'repository_tesim' config.add_show_field 'rights_country_tesim' diff --git a/app/forms/hyrax/californica_collections_form.rb b/app/forms/hyrax/californica_collections_form.rb index b3432762..69d57d19 100644 --- a/app/forms/hyrax/californica_collections_form.rb +++ b/app/forms/hyrax/californica_collections_form.rb @@ -8,6 +8,7 @@ class CalifornicaCollectionsForm < Hyrax::Forms::CollectionForm :extent, :architect, :binding_note, + :calligrapher, :caption, :collation, :colophon, @@ -15,6 +16,8 @@ class CalifornicaCollectionsForm < Hyrax::Forms::CollectionForm :composer, :condition_note, :dimensions, + :editor, + :engraver, :featured_image, :finding_aid_url, :foliation, @@ -35,10 +38,12 @@ class CalifornicaCollectionsForm < Hyrax::Forms::CollectionForm :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, + :printmaker, :provenance, :repository, :representative_image, @@ -81,6 +86,7 @@ def secondary_terms :architect, :binding_note, :based_near, + :calligrapher, :caption, :colophon, :commentator, @@ -89,6 +95,8 @@ def secondary_terms :creator, :date_created, :dimensions, + :editor, + :engraver, :extent, :finding_aid_url, :funding_note, @@ -107,10 +115,12 @@ def secondary_terms :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, + :printmaker, :provenance, :publisher, :repository, diff --git a/app/forms/hyrax/work_form.rb b/app/forms/hyrax/work_form.rb index 917991ef..1631e553 100644 --- a/app/forms/hyrax/work_form.rb +++ b/app/forms/hyrax/work_form.rb @@ -12,6 +12,7 @@ class WorkForm < Hyrax::Forms::WorkForm :ark, :binding_note, :author, + :calligrapher, :caption, :collation, :colophon, @@ -19,6 +20,8 @@ class WorkForm < Hyrax::Forms::WorkForm :commentator, :condition_note, :dimensions, + :editor, + :engraver, :extent, :featured_image, :finding_aid_url, @@ -41,11 +44,13 @@ class WorkForm < Hyrax::Forms::WorkForm :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, :preservation_copy, + :printmaker, :representative_image, :provenance, :repository, diff --git a/app/importers/californica_mapper.rb b/app/importers/californica_mapper.rb index cc9779c7..130a9bd8 100644 --- a/app/importers/californica_mapper.rb +++ b/app/importers/californica_mapper.rb @@ -17,6 +17,7 @@ class CalifornicaMapper < Darlingtonia::HashMapper ark: "Item ARK", binding_note: ["Binding note", "Description.binding"], author: "Author", + calligrapher: ["Calligrapher", "Name.calligrapher"], caption: "Description.caption", collation: "Collation", colophon: ["Colophon", "Description.colophon"], @@ -28,6 +29,8 @@ class CalifornicaMapper < Darlingtonia::HashMapper description: "Description.note", dimensions: "Format.dimensions", dlcs_collection_name: "Relation.isPartOf", + editor: ["Editor", "Name.editor"], + engraver: ["Engraver", "Name.engraver"], extent: "Format.extent", finding_aid_url: ["Finding Aid URL", "Alt ID.url"], foliation: ["Foliation note", "Foliation"], @@ -61,6 +64,7 @@ class CalifornicaMapper < Darlingtonia::HashMapper "Subject.personalName", "Subject name"], normalized_date: "Date.normalized", + note: ["Note"], opac_url: ["Opac url", "Description.opac"], page_layout: "Page layout", photographer: ["Name.photographer", @@ -68,6 +72,7 @@ class CalifornicaMapper < Darlingtonia::HashMapper place_of_origin: ["Place of origin", "Publisher.placeOfOrigin"], preservation_copy: "File Name", + printmaker: ["Printmaker", "Name.printmaker"], provenance: ["Provenance", "Description.history"], publisher: "Publisher.publisherName", repository: ["Repository", "repository", "Name.repository", diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index 32e992b8..1fa1b754 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -50,6 +50,10 @@ def binding_note self[:binding_note_ssi] end + def calligrapher + self[:calligrapher_tesim] + end + def caption self[:caption_tesim] end @@ -86,10 +90,22 @@ def dlcs_collection_name self[:dlcs_collection_name_ssm] end + def editor + self[:editor_tesim] + end + + def engraver + self[:engraver_tesim] + end + def extent self[:extent_tesim] end + def featured_image + self[:featured_image_ssi] + end + def foliation self[:foliation_ssi] end @@ -118,6 +134,14 @@ def iiif_range self[:iiif_range_ssi] end + def iiif_text_direction + self[:iiif_text_direction_ssi] + end + + def iiif_viewing_hint + self[:iiif_viewing_hint_ssi] + end + def illuminator self[:illuminator_tesim] end @@ -154,22 +178,6 @@ def masthead_parameters self[:masthead_parameters_ssi] end - def opac_url - self[:opac_url_ssi] - end - - def representative_image - self[:representative_image_ssi] - end - - def featured_image - self[:featured_image_ssi] - end - - def tagline - self[:tagline_ssi] - end - def medium self[:medium_tesim] end @@ -182,6 +190,14 @@ def normalized_date self[:normalized_date_tesim] end + def note + self[:note_tesim] + end + + def opac_url + self[:opac_url_ssi] + end + def page_layout self[:page_layout_ssim] end @@ -194,6 +210,10 @@ def place_of_origin self[:place_of_origin_tesim] end + def printmaker + self[:printmaker_tesim] + end + def preservation_copy self['preservation_copy_ssi'] end @@ -206,6 +226,10 @@ def repository self[:repository_tesim] end + def representative_image + self[:representative_image_ssi] + end + def rights_country self[:rights_country_tesim] end @@ -251,12 +275,8 @@ def support self[:support_tesim] end - def iiif_text_direction - self[:iiif_text_direction_ssi] - end - - def iiif_viewing_hint - self[:iiif_viewing_hint_ssi] + def tagline + self[:tagline_ssi] end def translator diff --git a/app/models/ucla_metadata.rb b/app/models/ucla_metadata.rb index b6632632..c5a38d58 100644 --- a/app/models/ucla_metadata.rb +++ b/app/models/ucla_metadata.rb @@ -31,6 +31,10 @@ module UclaMetadata index.as :stored_searchable end + property :calligrapher, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/cll') do |index| + index.as :stored_searchable + end + property :collation, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3077'), multiple: false do |index| index.as :stored_sortable end @@ -59,11 +63,19 @@ module UclaMetadata index.as :displayable, :facetable end + property :editor, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/edt') do |index| + index.as :stored_searchable + end + + property :engraver, predicate: ::RDF::URI.intern('hhttp://id.loc.gov/vocabulary/relators/egr') do |index| + index.as :stored_searchable + end + property :extent, predicate: ::RDF::Vocab::DC11.format do |index| index.as :stored_searchable, :facetable end - property :foliation, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3076'), multiple: false do |index| + property :featured_image, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3080'), multiple: false do |index| index.as :stored_sortable end @@ -71,6 +83,10 @@ module UclaMetadata index.as :displayable end + property :foliation, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3076'), multiple: false do |index| + index.as :stored_sortable + end + property :funding_note, predicate: ::RDF::URI.intern('http://bibfra.me/vocab/marc/fundingInformation') do |index| index.as :stored_searchable end @@ -87,6 +103,14 @@ module UclaMetadata index.as :stored_sortable end + property :iiif_text_direction, predicate: ::RDF::URI.intern('http://iiif.io/api/presentation/2#viewingDirection'), multiple: false do |index| + index.as :stored_sortable + end + + property :iiif_viewing_hint, predicate: ::RDF::URI.intern('http://iiif.io/api/presentation/2#ViewingHint'), multiple: false do |index| + index.as :stored_sortable + end + property :illuminator, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/ilu') do |index| index.as :stored_searchable, :facetable end @@ -103,14 +127,22 @@ module UclaMetadata index.as :stored_searchable end - property :location, predicate: ::RDF::Vocab::DC.coverage do |index| - index.as :stored_searchable, :facetable + property :latitude, predicate: ::RDF::Vocab::EXIF.gpsLatitude do |index| + index.as :stored_searchable end property :local_identifier, predicate: ::RDF::Vocab::Identifiers.local do |index| index.as :displayable, :facetable end + # property :local_rights_statement, predicate: ::RDF::URI.intern('http://purl.org/dc/terms/rights') do |index| + # index.as :symbol + # end # This invokes License renderer from hyrax gem + + property :location, predicate: ::RDF::Vocab::DC.coverage do |index| + index.as :stored_searchable, :facetable + end + property :longitude, predicate: ::RDF::Vocab::EXIF.gpsLongitude do |index| index.as :stored_searchable end @@ -123,18 +155,6 @@ module UclaMetadata index.as :stored_sortable end - property :representative_image, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3079'), multiple: false do |index| - index.as :stored_sortable - end - - property :featured_image, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3080'), multiple: false do |index| - index.as :stored_sortable - end - - property :tagline, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3081'), multiple: false do |index| - index.as :stored_sortable - end - property :medium, predicate: ::RDF::Vocab::DC.medium do |index| index.as :stored_searchable, :facetable end @@ -147,6 +167,10 @@ module UclaMetadata index.as :stored_searchable, :facetable end + property :note, predicate: ::RDF::URI.intern('http://bibfra.me/vocab/lite/note') do |index| + index.as :stored_searchable + end + property :opac_url, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/unimarc/terms/ter%23e'), multiple: false do |index| index.as :stored_sortable end @@ -167,6 +191,10 @@ module UclaMetadata index.as :stored_sortable end + property :printmaker, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/prm') do |index| + index.as :stored_searchable + end + property :provenance, predicate: ::RDF::URI.intern('http://purl.org/dc/terms/provenance') do |index| index.as :stored_searchable end @@ -175,6 +203,10 @@ module UclaMetadata index.as :stored_searchable end + property :representative_image, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3079'), multiple: false do |index| + index.as :stored_sortable + end + property :rights_country, predicate: ::RDF::Vocab::EBUCore.rightsType do |index| index.as :stored_searchable end @@ -187,18 +219,14 @@ module UclaMetadata index.as :stored_searchable end - # property :local_rights_statement, predicate: ::RDF::URI.intern('http://purl.org/dc/terms/rights') do |index| - # index.as :symbol - # end # This invokes License renderer from hyrax gem + property :scribe, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/scr') do |index| + index.as :stored_searchable, :facetable + end property :services_contact, predicate: ::RDF::Vocab::EBUCore.hasRightsContact do |index| index.as :displayable end - property :scribe, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/scr') do |index| - index.as :stored_searchable, :facetable - end - property :subject_topic, predicate: ::RDF::URI.intern('http://www.loc.gov/mods/rdf/v1#subjectTopic') do |index| index.as :stored_searchable end @@ -219,11 +247,7 @@ module UclaMetadata index.as :stored_searchable, :facetable end - property :iiif_text_direction, predicate: ::RDF::URI.intern('http://iiif.io/api/presentation/2#viewingDirection'), multiple: false do |index| - index.as :stored_sortable - end - - property :iiif_viewing_hint, predicate: ::RDF::URI.intern('http://iiif.io/api/presentation/2#ViewingHint'), multiple: false do |index| + property :tagline, predicate: ::RDF::URI.intern('http://iflastandards.info/ns/fr/frbr/frbrer/P3081'), multiple: false do |index| index.as :stored_sortable end diff --git a/app/presenters/hyrax/californica_collection_presenter.rb b/app/presenters/hyrax/californica_collection_presenter.rb index 91769955..d3a7eb35 100644 --- a/app/presenters/hyrax/californica_collection_presenter.rb +++ b/app/presenters/hyrax/californica_collection_presenter.rb @@ -11,6 +11,7 @@ def self.terms :author, :binding_note, :based_near, + :calligrapher, :creator, :commentator, :contributor, @@ -21,6 +22,8 @@ def self.terms :condition_note, :date_created, :dimensions, + :editor, + :engraver, :extent, :featured_image, :finding_aid_url, @@ -46,10 +49,12 @@ def self.terms :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, + :printmaker, :provenance, :publisher, :related_url, diff --git a/app/presenters/hyrax/work_presenter.rb b/app/presenters/hyrax/work_presenter.rb index ad7a51f1..bac4d847 100644 --- a/app/presenters/hyrax/work_presenter.rb +++ b/app/presenters/hyrax/work_presenter.rb @@ -10,6 +10,7 @@ class WorkPresenter < Hyrax::WorkShowPresenter :ark, :author, :binding_note, + :calligrapher, :caption, :collation, :colophon, @@ -18,6 +19,8 @@ class WorkPresenter < Hyrax::WorkShowPresenter :condition_note, :dimensions, :dlcs_collection_name, + :editor, + :engraver, :extent, :featured_image, :finding_aid_url, @@ -39,11 +42,13 @@ class WorkPresenter < Hyrax::WorkShowPresenter :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, :preservation_copy, + :printmaker, :provenance, :repository, :representative_image, diff --git a/app/views/hyrax/base/_attribute_rows.html.erb b/app/views/hyrax/base/_attribute_rows.html.erb index 98005d0c..76bcf2d7 100644 --- a/app/views/hyrax/base/_attribute_rows.html.erb +++ b/app/views/hyrax/base/_attribute_rows.html.erb @@ -5,6 +5,7 @@ <%= presenter.attribute_to_html(:author, html_dl: true) %> <%= presenter.attribute_to_html(:binding_note, html_dl: true) %> <%= presenter.attribute_to_html(:based_near_label, html_dl: true) %> +<%= presenter.attribute_to_html(:calligrapher, html_dl: true) %> <%= presenter.attribute_to_html(:caption, html_dl: true) %> <%= presenter.attribute_to_html(:collation, html_dl: true) %> <%= presenter.attribute_to_html(:colophon, html_dl: true) %> @@ -17,6 +18,8 @@ <%= presenter.attribute_to_html(:date_modified, label: t('hyrax.base.show.last_modified'), html_dl: true) %> <%= presenter.attribute_to_html(:dimensions, html_dl: true) %> <%= presenter.attribute_to_html(:dlcs_collection_name, render_as: :faceted, html_dl: true, label: "DLCS Collection Name") %> +<%= presenter.attribute_to_html(:editor, html_dl: true) %> +<%= presenter.attribute_to_html(:engraver, html_dl: true) %> <%= presenter.attribute_to_html(:extent, html_dl: true) %> <%= presenter.attribute_to_html(:featured_image, html_dl: true) %> <%= presenter.attribute_to_html(:finding_aid_url, html_dl: true) %> @@ -41,11 +44,13 @@ <%= presenter.attribute_to_html(:medium, html_dl: true) %> <%= presenter.attribute_to_html(:named_subject, html_dl: true) %> <%= presenter.attribute_to_html(:normalized_date, html_dl: true) %> +<%= presenter.attribute_to_html(:note, html_dl: true) %> <%= presenter.attribute_to_html(:opac_url, html_dl: true) %> <%= presenter.attribute_to_html(:page_layout, html_dl: true) %> <%= presenter.attribute_to_html(:photographer, html_dl: true) %> <%= presenter.attribute_to_html(:place_of_origin, html_dl: true) %> <%= presenter.attribute_to_html(:preservation_copy, html_dl: true) %> +<%= presenter.attribute_to_html(:printmaker, html_dl: true) %> <%= presenter.attribute_to_html(:provenance, html_dl: true) %> <%= presenter.attribute_to_html(:publisher, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:related_url, render_as: :external_link, html_dl: true) %> diff --git a/spec/fixtures/coordinates_example.csv b/spec/fixtures/coordinates_example.csv index 990fba76..2a5849d6 100644 --- a/spec/fixtures/coordinates_example.csv +++ b/spec/fixtures/coordinates_example.csv @@ -1,2 +1,2 @@ -Project Name,Object Type,Parent ARK,Item ARK,Item Status,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Illustrator,Name.illustrator,Description.history,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator -Los Angeles Daily News Negatives,Work,111/222,13030/hb338nb26f,Completed with minimal metadata,"Altars|~|Mass|~|Communion table|~|Mexican American Catholics|~|Festivals|~|Guadalupe, Our Lady of|~|Historic buildings $z California $z Los Angeles|~|Churches $z California $z Los Angeles|~|Religion|~|Catholic churches $z California $z Los Angeles ",still image,copyrighted,news photographs,"Plaza Church (Los Angeles, Calif.)",Los Angeles (Calif.)|~|Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",Imhotep,Famous Photographer,,1942/1952,uclamss_1387_b112_40911-1,"Communion at Plaza Church, Los Angeles, 1942-1952",[between 1942-1947],Fake Extent,Fake Medium,200x200,"A woman takes Communion during a Plaza Church mass for the fiesta of Nuestra Senora de Guadalupe.|~|Our Lady Queen of Los Angeles Catholic Church, (aka La Iglesia de Nuestra Señora la Reina de Los Ángeles, and The Church of Our Lady the Queen of the Angels), was built in 1822 and is the oldest church in Los Angeles.",Fake Funding Note,-118.239577,34.05707,Fake Caption,clusc_1_1_00010432a.tif,Communion table,Mesa de Comunión,Los Angeles,Mexican American Catholics,UCLA,Famous Author,Mexican American Catholics,images,left-to-right,Green,paged,iiif-range,illustration-note,Illustrator-Person1,Illustrator-PersonName,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,https://www.library.ucla.edu,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator +Project Name,Object Type,Parent ARK,Item ARK,Item Status,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.Uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Illustrator,Name.illustrator,Description.history,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker +Los Angeles Daily News Negatives,Work,111/222,13030/hb338nb26f,Completed with minimal metadata,"Altars|~|Mass|~|Communion table|~|Mexican American Catholics|~|Festivals|~|Guadalupe, Our Lady of|~|Historic buildings $z California $z Los Angeles|~|Churches $z California $z Los Angeles|~|Religion|~|Catholic churches $z California $z Los Angeles ",still image,copyrighted,news photographs,"Plaza Church (Los Angeles, Calif.)",Los Angeles (Calif.)|~|Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",Imhotep,Famous Photographer,,1942/1952,uclamss_1387_b112_40911-1,"Communion at Plaza Church, Los Angeles, 1942-1952",[between 1942-1947],Fake Extent,Fake Medium,200x200,"A woman takes Communion during a Plaza Church mass for the fiesta of Nuestra Senora de Guadalupe.|~|Our Lady Queen of Los Angeles Catholic Church, (aka La Iglesia de Nuestra Señora la Reina de Los Ángeles, and The Church of Our Lady the Queen of the Angels), was built in 1822 and is the oldest church in Los Angeles.",Fake Funding Note,-118.239577,34.05707,Fake Caption,clusc_1_1_00010432a.tif,Communion table,Mesa de Comunión,Los Angeles,Mexican American Catholics,UCLA,Famous Author,Mexican American Catholics,images,left-to-right,Green,paged,iiif-range,illustration-note,Illustrator-1,Illustrator-P2,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,https://www.library.ucla.edu,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,Calligrapher-1,Name-calligrapher,Editor-1,Name-editor,Engraver-1,Name-engraver,Note-1,Printmaker-1,Name-printmaker diff --git a/spec/fixtures/coordinates_example_update.csv b/spec/fixtures/coordinates_example_update.csv index 779f9ed7..ed89f0c2 100644 --- a/spec/fixtures/coordinates_example_update.csv +++ b/spec/fixtures/coordinates_example_update.csv @@ -1,2 +1,2 @@ -Project Name,Object Type,Parent ARK,Item ARK,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,Author,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance; Description.history,Table of Contents; Description.tableOfContents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note; Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,Illustrator,Name.illustrator -Los Angeles Daily News Negatives,Work,111/222,13030/hb338nb26f,"Altars|~|Mass|~|Communion table|~|Mexican American Catholics|~|Festivals|~|Guadalupe, Our Lady of|~|Historic buildings $z California $z Los Angeles|~|Churches $z California $z Los Angeles|~|Religion|~|Catholic churches $z California $z Los Angeles ",still image,copyrighted,news photographs,"Plaza Church (Los Angeles, Calif.)",Los Angeles (Calif.)|~|Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",Famous Photographer,,1942/1952,uclamss_1387_b112_40911-1,"Communion at Plaza Church, Los Angeles, 1942-1952",[between 1942-1947],Better Extent,,200x200,"A woman takes Communion during a Plaza Church mass for the fiesta of Nuestra Senora de Guadalupe.|~|Our Lady Queen of Los Angeles Catholic Church, (aka La Iglesia de Nuestra Señora la Reina de Los Ángeles, and The Church of Our Lady the Queen of the Angels), was built in 1822 and is the oldest church in Los Angeles.",Better Funding Note,-118.239577,34.05707,Better Caption,clusc_1_1_00010432a.tif, Famous Author,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,https://www.linrary.ucla.edu,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,Illustrator-Person1,Illustrator-PersonName +Project Name,Object Type,Parent ARK,Item ARK,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,Author,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance; Description.history,Table of Contents; Description.tableOfContents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note; Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,Illustrator,Name.illustrator,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker +Los Angeles Daily News Negatives,Work,111/222,13030/hb338nb26f,"Altars|~|Mass|~|Communion table|~|Mexican American Catholics|~|Festivals|~|Guadalupe, Our Lady of|~|Historic buildings $z California $z Los Angeles|~|Churches $z California $z Los Angeles|~|Religion|~|Catholic churches $z California $z Los Angeles ",still image,copyrighted,news photographs,"Plaza Church (Los Angeles, Calif.)",Los Angeles (Calif.)|~|Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",Famous Photographer,,1942/1952,uclamss_1387_b112_40911-1,"Communion at Plaza Church, Los Angeles, 1942-1952",[between 1942-1947],Better Extent,,200x200,"A woman takes Communion during a Plaza Church mass for the fiesta of Nuestra Senora de Guadalupe.|~|Our Lady Queen of Los Angeles Catholic Church, (aka La Iglesia de Nuestra Señora la Reina de Los Ángeles, and The Church of Our Lady the Queen of the Angels), was built in 1822 and is the oldest church in Los Angeles.",Better Funding Note,-118.239577,34.05707,Better Caption,clusc_1_1_00010432a.tif, Famous Author,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,https://www.linrary.ucla.edu,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,Illustrator-1,Illustrator-PersonName,Calligrapher-1,Name-calligrapher,Editor-1,Name-editor,Engraver-1,Name-engraver,Note-1,Printmaker-1,Name-printmaker diff --git a/spec/fixtures/csv_import/good/all_fields.csv b/spec/fixtures/csv_import/good/all_fields.csv index 09d821da..cbc44aa1 100644 --- a/spec/fixtures/csv_import/good/all_fields.csv +++ b/spec/fixtures/csv_import/good/all_fields.csv @@ -1,3 +1,3 @@ -Object Type,Title,Item ARK,Parent ARK,Rights.copyrightStatus,File Name,AltIdentifier.local,Coverage.geographic,Date.creation,Date.normalized,Description.caption,Description.fundingNote,Description.latitude,Description.longitude,Description.note,Format.dimensions,Format.extent,Format.medium,Language,Name.photographer,Name.repository,Name.subject,Project Name,Publisher.publisherName,Relation.isPartOf,Rights.countryCreation,Rights.rightsHolderContact,Rights.servicesContact,Subject,Type.genre,Type.typeOfResource,Name.architect,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,IIIF Manifest URL,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,License,Illustrator,Name.illustrator -Collection,"Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)",21198/zz00011f8m,,copyrighted,,Collection 686,,1937-1983,1937/1983,,,,,"Walter E. Bennett (1921-1995) was the first salaried photographer for Time, where he worked from 1952 to 1982. The collection consists of photographic materials such as prints, negatives and slides. It also includes miscellaneous manuscripts and ephemera related to Bennett's life and career.",,,,,"Bennett, Walter E. (Walter Edward), 1921-1995","University of California, Los Angeles. $b Library Special Collections",,,,,,,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",,,,,,,Los Angeles,"Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)",UCLA,A collection of photos by Walter Bennett,summary_1,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,manifest_url_1,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-Person1,Illustrator-PersonName -Work,Anti-war demonstrators attend the 1971 May Day Protest in Washington D.C.,21198/zz0001q2jd,21198/zz00011f8m,copyrighted,food.tif,uclamss_686_b4_f16_1,,"May 3, 1971",1971-05-03,,,,,,35 mm,,1 photograph|~|color slide,,"Bennett, Walter E. (Walter Edward), 1921-1995","University of California, Los Angeles. $b Library Special Collections",,,,,,,,"Demonstrations--Washington (D.C.)|~|Vietnamese Conflict, 1961-1975--Protest movements--Washington (D.C)",news photographs,still image,Imhotep,"Walter Bennett Collection","Walter Bennett Colección",California,Anti-war demonstrators attend the 1971 May Day Protest in Washington D.C.,UCLA,Famous Author,May Day protest in 1971,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,manifest_url_2,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-Person1,Illustrator-PersonName +Object Type,Title,Item ARK,Parent ARK,Rights.copyrightStatus,File Name,AltIdentifier.local,Coverage.geographic,Date.creation,Date.normalized,Description.caption,Description.fundingNote,Description.latitude,Description.longitude,Description.note,Format.dimensions,Format.extent,Format.medium,Language,Name.photographer,Name.repository,Name.subject,Project Name,Publisher.publisherName,Relation.isPartOf,Rights.countryCreation,Rights.rightsHolderContact,Rights.servicesContact,Subject,Type.genre,Type.typeOfResource,Name.architect,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,IIIF Manifest URL,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,License,Illustrator,Name.illustrator-2,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker +Collection,"Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)",21198/zz00011f8m,,copyrighted,,Collection 686,,1937-1983,1937/1983,,,,,"Walter E. Bennett (1921-1995) was the first salaried photographer for Time, where he worked from 1952 to 1982. The collection consists of photographic materials such as prints, negatives and slides. It also includes miscellaneous manuscripts and ephemera related to Bennett's life and career.",,,,,"Bennett, Walter E. (Walter Edward), 1921-1995","University of California, Los Angeles. $b Library Special Collections",,,,,,,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",,,,,,,Los Angeles,"Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)",UCLA,A collection of photos by Walter Bennett,summary_1,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,manifest_url_1,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-1,Illustrator-2,Calligrapher-1,Calligrapher-2,Editor-1,Editor-2,Engraver-1,Engraver-2,Note,Printmaker-1,Printmaker-2 +Work,Anti-war demonstrators attend the 1971 May Day Protest in Washington D.C.,21198/zz0001q2jd,21198/zz00011f8m,copyrighted,food.tif,uclamss_686_b4_f16_1,,"May 3, 1971",1971-05-03,,,,,,35 mm,,1 photograph|~|color slide,,"Bennett, Walter E. (Walter Edward), 1921-1995","University of California, Los Angeles. $b Library Special Collections",,,,,,,,"Demonstrations--Washington (D.C.)|~|Vietnamese Conflict, 1961-1975--Protest movements--Washington (D.C)",news photographs,still image,Imhotep,"Walter Bennett Collection","Walter Bennett Colección",California,Anti-war demonstrators attend the 1971 May Day Protest in Washington D.C.,UCLA,Famous Author,May Day protest in 1971,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,manifest_url_2,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-1,Illustrator-2,Calligrapher-1,Name-calligrapher,Editor-1,Name-editor,Engraver-1,Name-engraver,Note-1,Printmaker-1,Name-printmaker diff --git a/spec/fixtures/example.csv b/spec/fixtures/example.csv index 106b6a5c..c1b91e02 100644 --- a/spec/fixtures/example.csv +++ b/spec/fixtures/example.csv @@ -1,2 +1,2 @@ -Object Type,Project Name,Parent ARK,Item ARK,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,License,Illustrator,Name.illustrator -Work,Los Angeles Daily News Negatives,21198/zz00294nz8,21198/zz0002nq4w,Eminent domain--California--Los Angeles|~|Demonstrations--California--Los Angeles County|~|Express highways--California--Los Angeles County--Design and construction|~|Government|~|Transportation|~|Activism|~|Interstate 10,still image,copyrighted,news photographs,Los Angeles County (Calif.). $b Board of Supervisors,Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",,,,1947-09-17,uclalat_1387_b107_40098,"Protesters with signs in gallery of Los Angeles County Supervisors hearing over eminent domain for construction of Harbor Freeway, Calif., 1947","September 17, 1947",1 photograph,b&w negative,10 x 12.5 cm.,"At the Hall of Records, 220 N. Broadway.|~|Description 2",Info about funding,-118.243865,34.054133,This example does not have a caption.,clusc_1_1_00010432a.tif,"Protesters with signs"," manifestante n común",Los Angeles,Los Angeles Daily News Negatives,UCLA,Famous Author,Protesters with signs,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-Person1,Illustrator-PersonName +Object Type,Project Name,Parent ARK,Item ARK,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Provenance,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note,Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statementLocal,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,License,Illustrator,Name.illustrator,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker +Work,Los Angeles Daily News Negatives,21198/zz00294nz8,21198/zz0002nq4w,Eminent domain--California--Los Angeles|~|Demonstrations--California--Los Angeles County|~|Express highways--California--Los Angeles County--Design and construction|~|Government|~|Transportation|~|Activism|~|Interstate 10,still image,copyrighted,news photographs,Los Angeles County (Calif.). $b Board of Supervisors,Los Angeles (Calif.),"Los Angeles Daily News Negatives. Department of Special Collections, Charles E. Young Research Library, University of California at Los Angeles.",Los Angeles Daily News,US,"UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: spec-coll@library.ucla.edu. Phone: (310)825-4988",,,,1947-09-17,uclalat_1387_b107_40098,"Protesters with signs in gallery of Los Angeles County Supervisors hearing over eminent domain for construction of Harbor Freeway, Calif., 1947","September 17, 1947",1 photograph,b&w negative,10 x 12.5 cm.,"At the Hall of Records, 220 N. Broadway.|~|Description 2",Info about funding,-118.243865,34.054133,This example does not have a caption.,clusc_1_1_00010432a.tif,"Protesters with signs"," manifestante n común",Los Angeles,Los Angeles Daily News Negatives,UCLA,Famous Author,Protesters with signs,images,left-to-right,Green,paged,iiif-range,illustration-note,history-description,table of contents,concept-topic,descriptive-topic,collated,follated,also follated,illuminated,also illuminated,la la la,Schubert,Amat-Mamu,Sin-liqe-unninni,condition_note,local_statement,local_masthead,local_representative_image,local_featured_image,local_tagline,commentator_1,commentator_2,translator_1,translator_2,subject_temporal_1,example_opac_url,subject_geographic_1,colophon_text,colophon_text_2,finding_aid_url_1,finding_aid_url_2,rubricator_1,rubricator_2,name_creator,http://creativecommons.org/publicdomain/zero/1.0/,Illustrator-1,Illustrator-2,Calligrapher-1,Name-calligrapher,Editor-1,Name-editor,Engraver-1,Name-engraver,Note-1,Printmaker-1,Name-printmaker diff --git a/spec/fixtures/simple_example.csv b/spec/fixtures/simple_example.csv index a28df1ba..65e3e041 100644 --- a/spec/fixtures/simple_example.csv +++ b/spec/fixtures/simple_example.csv @@ -1,2 +1,2 @@ -License,Project Name,Object Type,Parent ARK,Item ARK,Item Status,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Description.history,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,Illustrator,Name.illustrator -http://creativecommons.org/publicdomain/mark/1.0/,Project-Name,Work,111/222,13030/hb338nb26f,Completed,Subject,still image,copyrighted,news photos,Name-subject,Coverage-geographic,Relation-isPartOf,Publisher-Name,Rights-Creation,Rights-HolderContact,Architect,Photographer,Repositor-Name,2-14-2020,AltIdentifier,Title,Date-creation,Format-extent,Format-medium,Dimensions,Description-note,FundingNote,Longitude,Latitude,Caption,File-Name,AltTitle-other,AltTitle-translated,Place of origin,AltTitle-Uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Hhistory,Table of Contents,SubjectConceptTopic,Subject-DescriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Iilluminator,Lyricist,Composer,Scribe,Name-Scribe,Condition note,Rights-Statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name-Commentator,Translator,Translator,Subject temporal,Opac url,Subject geographic,Colophon,Description-Colophon,Finding Aid URL,Alt ID-Url,Rubricator,Name-Rubricator,Name-Creator,Illustrator-Person1,Illustrator-PersonName +License,Project Name,Object Type,Parent ARK,Item ARK,Item Status,Subject,Type.typeOfResource,Rights.copyrightStatus,Type.genre,Name.subject,Coverage.geographic,Relation.isPartOf,Publisher.publisherName,Rights.countryCreation,Rights.rightsHolderContact,Name.architect,Name.photographer,Name.repository,Date.normalized,AltIdentifier.local,Title,Date.creation,Format.extent,Format.medium,Format.dimensions,Description.note,Description.fundingNote,Description.longitude,Description.latitude,Description.caption,File Name,AltTitle.other,AltTitle.translated,Place of origin,AltTitle.uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Description.history,Table of Contents,Subject.conceptTopic,Subject.descriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Name.illuminator,Name.lyricist,Name.composer,Scribe,Name.scribe,Condition note,Rights.statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name.commentator,Translator,Name.translator,Subject temporal,Opac url,Subject geographic,Colophon,Description.colophon,Finding Aid URL,Alt ID.url,Rubricator,Name.rubricator,Name.creator,Illustrator,Name.illustrator,Calligrapher,Name.calligrapher,Editor,Name.editor,Engraver,Name.engraver,Note,Printmaker,Name.printmaker +http://creativecommons.org/publicdomain/mark/1.0/,Project-Name,Work,111/222,13030/hb338nb26f,Completed,Subject,still image,copyrighted,news photos,Name-subject,Coverage-geographic,Relation-isPartOf,Publisher-Name,Rights-Creation,Rights-HolderContact,Architect,Photographer,Repositor-Name,2-14-2020,AltIdentifier,Title,Date-creation,Format-extent,Format-medium,Dimensions,Description-note,FundingNote,Longitude,Latitude,Caption,File-Name,AltTitle-other,AltTitle-translated,Place of origin,AltTitle-Uniform,Support,Author,Summary,Page layout,Text direction,Binding note,viewingHint,IIIF Range,Illustrations note,Hhistory,Table of Contents,SubjectConceptTopic,Subject-DescriptiveTopic,Collation,Foliation note, Foliation,Illuminator,Iilluminator,Lyricist,Composer,Scribe,Name-Scribe,Condition note,Rights-Statement,Masthead,Representative image,Featured image,Tagline,Commentator,Name-Commentator,Translator,Translator,Subject temporal,Opac url,Subject geographic,Colophon,Description-Colophon,Finding Aid URL,Alt ID-Url,Rubricator,Name-Rubricator,Name-Creator,Illustrator-1,Illustrator-2,Calligrapher-1,Name-calligrapher,Editor-1,Name-editor,Engraver-1,Name-engraver,Note-1,Printmaker-1,Name-printmaker diff --git a/spec/forms/hyrax/work_form_spec.rb b/spec/forms/hyrax/work_form_spec.rb index e5bbcab7..82a55cf4 100644 --- a/spec/forms/hyrax/work_form_spec.rb +++ b/spec/forms/hyrax/work_form_spec.rb @@ -12,6 +12,7 @@ :architect, :author, :binding_note, + :calligrapher, :caption, :commentator, :collation, @@ -20,6 +21,8 @@ :condition_note, :creator, :dimensions, + :editor, + :engraver, :extent, :featured_image, :finding_aid_url, @@ -41,11 +44,13 @@ :medium, :named_subject, :normalized_date, + :note, :opac_url, :page_layout, :photographer, :place_of_origin, :preservation_copy, + :printmaker, :provenance, :repository, :representative_image, diff --git a/spec/importers/californica_csv_parser_spec.rb b/spec/importers/californica_csv_parser_spec.rb index f7311ed9..e0b71e44 100644 --- a/spec/importers/californica_csv_parser_spec.rb +++ b/spec/importers/californica_csv_parser_spec.rb @@ -134,7 +134,16 @@ 'Name.creator', 'License', 'Illustrator', - 'Name.illustrator'] + 'Name.illustrator', + 'Calligrapher', + 'Name.calligrapher', + 'Editor', + 'Name.editor', + 'Engraver', + 'Name.engraver', + 'Note', + 'Printmaker', + 'Name.printmaker'] end it 'knows the headers for this CSV file' do diff --git a/spec/importers/californica_mapper_spec.rb b/spec/importers/californica_mapper_spec.rb index 0349caf8..14a709e4 100644 --- a/spec/importers/californica_mapper_spec.rb +++ b/spec/importers/californica_mapper_spec.rb @@ -109,7 +109,18 @@ "Rubricator" => "rubricator_1", # rubricator "Name.rubricator" => "rubricator_2", # rubricator "Name.creator" => "name_creator", # creator - "License" => "http://creativecommons.org/publicdomain/zero/1.0/" # license + "License" => "http://creativecommons.org/publicdomain/zero/1.0/", # license + "llustrator" => "Illustrator-1", # illustrator + "Name.llustrator" => "Name-Illustrator", # illustrator + "Calligrapher" => "Calligrapher-1", # calligrapher + "Name.calligrapher" => "Name-calligrapher", # calligrapher + "Editor" => "Editor-1", # editor + "Name.editor" => "Name-editor", # editor + "Engraver" => "Engraver-1", # engraver + "Name.engraver" => "Name-engraver", # engraver + "Note" => "Note-1", # note + "Printmaker" => "Printmaker-1", # printmaker + "Name.printmaker" => "Name-printmaker" # printmaker } end @@ -148,6 +159,7 @@ :architect, :ark, :binding_note, + :calligrapher, :caption, :collation, :colophon, @@ -159,6 +171,8 @@ :description, :dimensions, :dlcs_collection_name, + :editor, + :engraver, :extent, :finding_aid_url, :foliation, @@ -179,11 +193,13 @@ :medium, :named_subject, :normalized_date, + :note, :opac_url, :publisher, :photographer, :page_layout, :place_of_origin, + :printmaker, :publisher, :provenance, :repository, diff --git a/spec/system/edit_collection_spec.rb b/spec/system/edit_collection_spec.rb index 398a5075..4e1e8603 100644 --- a/spec/system/edit_collection_spec.rb +++ b/spec/system/edit_collection_spec.rb @@ -74,7 +74,12 @@ finding_aid_url: ['Old Finding aid url'], rubricator: ['Old rubricator'], creator: ['Old name creator'], - license: ['http://creativecommons.org/publicdomain/zero/1.0/'] + license: ['http://creativecommons.org/publicdomain/zero/1.0/'], + calligrapher: ['Old Calligrapher'], + engraver: ['Old Engraver'], + editor: ['Old Editor'], + note: ['Old Note'], + printmaker: ['Old Printmaker'] # local_rights_statement: ['Old Rights statement local'] # This invokes License renderer from hyrax gem } end @@ -156,6 +161,11 @@ expect(find_field('Rubricator').value).to eq 'Old rubricator' expect(find_field('Creator').value).to eq 'Old name creator' expect(page).to have_select('License', selected: 'Creative Commons CC0 1.0 Universal', multiple: false) + expect(find_field('Calligrapher').value).to eq 'Old Calligrapher' + expect(find_field('Engraver').value).to eq 'Old Engraver' + expect(find_field('Editor').value).to eq 'Old Editor' + expect(find_field('Note').value).to eq 'Old Note' + expect(find_field('Printmaker').value).to eq 'Old Printmaker' # expect(find_field('Local rights statement').value).to eq 'Old Rights statement local' # diff --git a/spec/system/edit_work_spec.rb b/spec/system/edit_work_spec.rb index b3f37194..b64c4391 100644 --- a/spec/system/edit_work_spec.rb +++ b/spec/system/edit_work_spec.rb @@ -14,11 +14,14 @@ ark: 'ark:/abc/3456', author: ['Old Author'], caption: ['Old Caption'], + calligrapher: ['Old Calligrapher'], contributor: ['Old Contributor'], creator: ['Old Creator'], date_created: ['Old Creation Date'], description: ['Old Desc'], dimensions: ['Old Dim'], + editor: ['Old Editor'], + engraver: ['Engraver'], extent: ['Old Extent'], funding_note: ['Old Fund Note'], genre: ['Old Genre'], @@ -35,10 +38,12 @@ medium: ['Old Medium'], named_subject: ['Old Name/Subj'], normalized_date: ['1900/1901'], + note: ['Old Note'], page_layout: ['Old Page layout'], photographer: ['Old Photographer'], place_of_origin: ['Old Place of origin'], preservation_copy: 'dlmasters/ethiopian/masters/abc123.tif', + printmaker: ['Old printmaker'], provenance: ['Old Provenance'], publisher: ['Old Pub'], repository: ['Old Repository'], diff --git a/spec/system/import_and_show_work_spec.rb b/spec/system/import_and_show_work_spec.rb index 339b984f..399d95ae 100644 --- a/spec/system/import_and_show_work_spec.rb +++ b/spec/system/import_and_show_work_spec.rb @@ -30,6 +30,8 @@ expect(work.member_of_collections).to eq [collection] # displays expected fields on show work page + # these should match the value in the coordinates_example.csv + work = Work.last expect(work.id).to eq "f62bn833bh-03031" visit("/concern/works/#{work.id}") @@ -37,6 +39,7 @@ expect(page).to have_content "ark:/13030/hb338nb26f" # ark expect(page).to have_content "Imhotep" # architect expect(page).to have_content "Alternative title" # alternative_title + expect(page).to have_content "Calligrapher-1" expect(page).to have_content "Guadalupe, Our Lady of" # subject expect(page).to have_content "Churches--California--Los Angeles" # subject expect(page).to have_content "Historic buildings--California--Los Angeles" # $subject: $z has been replaced with -- @@ -52,6 +55,8 @@ expect(page).to have_content "1942/1952" # normalized_date expect(page).to have_content "uclamss_1387_b112_40911-1" # local_identifier expect(page).to have_content "[between 1942-1947]" # date_created + expect(page).to have_content "Editor-1" + expect(page).to have_content "Engraver-1" expect(page).to have_content "1 photograph" # extent expect(page).to have_content "Fake Medium" # medium expect(page).to have_content "200x200" # dimensions @@ -71,11 +76,11 @@ expect(page).to have_content "https://www.library.ucla.edu" # opac_url expect(page).to have_content "Binding note" # binding_note expect(page).to have_content "left-to-right" # iiif_text_direction - expect(page).to have_content "Uniform title" # uniform_title + expect(page).to have_content "Mexican American Catholics" # uniform_title expect(page).to have_content "clusc_1_1_00010432a.tif" # preservation_copy expect(page).to have_content "iiif-range" # iiif_range expect(page).to have_content "illustration-note" # illustrations_note - expect(page).to have_content "Illustrator-Person1" # illustrator + expect(page).to have_content "Illustrator-1" # illustrator expect(page).to have_content "history-description" # provenance expect(page).to have_content "table of contents" # toc expect(page).to have_content "concept-topic" # subject_topic @@ -101,6 +106,12 @@ expect(page).to have_content "finding_aid_url_2" # finding_aid_url expect(page).to have_content "rubricator_1" # rubricator expect(page).to have_content "name_creator" # creator + expect(page).to have_content "Calligrapher-1" # calligrapher + expect(page).to have_content "Editor-1" # editor + expect(page).to have_content "Engraver-1" # engraver + expect(page).to have_content "Note-1" # note + expect(page).to have_content "Printmaker-1" # print maker + # expect(page).to have_content "local_statement" # local_rights_statement # This invokes License renderer from hyrax gem # displays expected fields on search results page diff --git a/spec/system/show_collection_spec.rb b/spec/system/show_collection_spec.rb index 78e14a87..dbacabe1 100644 --- a/spec/system/show_collection_spec.rb +++ b/spec/system/show_collection_spec.rb @@ -13,9 +13,12 @@ architect: ['Old Architect'], author: ['Old Author'], binding_note: 'Old Binding note', + calligrapher: ['Old Calligrapher'], date_created: ['Old Creation Date'], description: ['Old Desc'], dimensions: ['Old Dim'], + editor: ['Old Editor'], + engraver: ['Old Engraver'], extent: ['Old Extent'], caption: ['Old Cap'], funding_note: ['Old Fund Note'], @@ -33,10 +36,12 @@ medium: ['Old Medium'], named_subject: ['Old Name/Subj'], normalized_date: ['1900/1901'], + note: ['Old Note'], opac_url: 'https://www.library.ucla.edu', page_layout: ['Old Page layout'], photographer: ['Old Photographer'], place_of_origin: ['Old Place of origin'], + printmaker: ['Old Printmaker'], provenance: ['Old Provenance'], publisher: ['Old Pub'], repository: ['Old Repository'], diff --git a/spec/uploaders/csv_manifest_validator_spec.rb b/spec/uploaders/csv_manifest_validator_spec.rb index 44fb6557..f0b50a94 100644 --- a/spec/uploaders/csv_manifest_validator_spec.rb +++ b/spec/uploaders/csv_manifest_validator_spec.rb @@ -157,6 +157,7 @@ "AltTitle.uniform", "Author", "Binding note", + "Calligrapher", "Collation", "Colophon", "Commentator", @@ -181,6 +182,8 @@ "Description.note", "Description.opac", "Description.tableOfContents", + "Editor", + "Engraver", "Featured image", "featured_image", "File Name", @@ -197,24 +200,29 @@ "Illuminator", "Illustrations note", "Illustrator", - "Name.illustrator", "Item ARK", "Item Sequence", "Language", "Local identifier", "Masthead", "Name.architect", + "Name.calligrapher", + "Name.editor", + "Name.engraver", "Name.commentator", "Name.composer", "Name.creator", "Name.illuminator", + "Name.illustrator", "Name.lyricist", + "Name.printmaker", "Name.photographer", "Name.repository", "Name.rubricator", "Name.scribe", "Name.subject", "Name.translator", + "Note", "Object Type", "Opac url", "Page layout", @@ -224,6 +232,7 @@ "Personal or Corporate Name.repository", "Personal or Corporate Name.subject", "Place of origin", + "Printmaker", "Project Name", "Provenance", "Publisher.placeOfOrigin", diff --git a/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb b/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb index 64e6e2d2..d5302f97 100644 --- a/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb +++ b/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb @@ -11,47 +11,52 @@ let(:presenter) { Hyrax::WorkPresenter.new(solr_document, ability) } let(:solr_document) { SolrDocument.new(work.to_solr) } let(:work) do - Work.new(title: ['title'], - ark: 'ark:/abcde/1234567', + Work.new(ark: 'ark:/abcde/1234567', author: ['author'], - opac_url: 'opac_url', binding_note: 'binding_note', - description: ['description'], - extent: ['extent'], + calligrapher: ['calligrapher'], caption: ['caption'], + colophon: ['Old Colophon'], + commentator: ['Old Commentator'], + condition_note: 'condition_note', + creator: ['Old name creator'], + description: ['description'], dimensions: ['dimensions'], + editor: ['editor'], + engraver: ['engraver'], + extent: ['extent'], + finding_aid_url: ['Old Finding aid url'], funding_note: ['funding_note'], genre: ['genre'], + iiif_text_direction: 'iiif_text_direction', iiif_viewing_hint: 'iiif_viewing_hint', illustrator: ['illustrator'], - location: ['location'], latitude: ['latitude'], + license: ['Creative Commons CC0 1.0 Universal'], + location: ['location'], local_identifier: ['local'], longitude: ['longitude'], medium: ['medium'], named_subject: ['named_subject'], normalized_date: ['normalized_date'], + note: ['note'], + opac_url: 'opac_url', page_layout: ['page_layout'], place_of_origin: ['place_of_origin'], + printmaker: ['Old printmaker'], repository: ['repostiory'], resource_type: ['resource_type'], rights_country: ['rights_country'], rights_holder: ['rights_holder'], + rubricator: ['Old rubricator'], + subject_geographic: ['Old Subject geographic'], + subject_temporal: ['Old Subject temporal'], subject_topic: ['subject_topic'], summary: ['summary'], support: ['support'], - iiif_text_direction: 'iiif_text_direction', - uniform_title: ['Old Uniform title'], - condition_note: 'condition_note', - commentator: ['Old Commentator'], - subject_geographic: ['Old Subject geographic'], - subject_temporal: ['Old Subject temporal'], + title: ['title'], translator: ['Old Translator'], - colophon: ['Old Colophon'], - finding_aid_url: ['Old Finding aid url'], - rubricator: ['Old rubricator'], - creator: ['Old name creator'], - license: ['Creative Commons CC0 1.0 Universal']) + uniform_title: ['Old Uniform title']) # local_rights_statement: ['local_statement']) end @@ -62,27 +67,51 @@ it 'has author' do expect(page).to match(/author/) end - it 'has opac_url' do - expect(page).to match(/opac_url/) - end it 'has binding_note' do expect(page).to match(/binding_note/) end + it 'has calligrapher' do + expect(page).to match(/calligrapher/) + end it 'has caption' do expect(page).to match(/caption/) end + it 'has colophon' do + expect(page).to match(/colophon/) + end + it 'has commentator' do + expect(page).to match(/commentator/) + end + it 'has condition_note' do + expect(page).to match(/condition_note/) + end + it 'has creator' do + expect(page).to match(/creator/) + end it 'has dimesions' do expect(page).to match(/dimensions/) end + it 'has editor' do + expect(page).to match(/editor/) + end + it 'has engraver' do + expect(page).to match(/engraver/) + end it 'has extent' do expect(page).to match(/extent/) end + it 'has finding_aid_url' do + expect(page).to match(/finding_aid_url/) + end it 'has funding_note' do expect(page).to match(/funding_note/) end it 'has genre' do expect(page).to match(/genre/) end + it 'has iiif_text_direction' do + expect(page).to match(/iiif_text_direction/) + end it 'has iiif_viewing_hint' do expect(page).to match(/iiif_viewing_hint/) end @@ -92,6 +121,9 @@ it 'has latitude' do expect(page).to match(/latitude/) end + it 'has license' do + expect(page).to match(/license/) + end it 'has location' do expect(page).to match(/location/) end @@ -110,12 +142,21 @@ it 'has normalized_date' do expect(page).to match(/normalized_date/) end + it 'has note' do + expect(page).to match(/note/) + end + it 'has opac_url' do + expect(page).to match(/opac_url/) + end it 'has page_layout' do expect(page).to match(/page_layout/) end it 'has place_of_origin' do expect(page).to match(/place_of_origin/) end + it 'has printmaker' do + expect(page).to match(/printmaker/) + end it 'has repo' do expect(page).to match(/repository/) end @@ -128,6 +169,15 @@ it 'has rights_holder' do expect(page).to match(/rights_holder/) end + it 'has rubricator' do + expect(page).to match(/rubricator/) + end + it 'has subject_geographic' do + expect(page).to match(/subject_geographic/) + end + it 'has subject_temporal' do + expect(page).to match(/subject_temporal/) + end it 'has subject_topic' do expect(page).to match(/subject_topic/) end @@ -137,41 +187,14 @@ it 'has support' do expect(page).to match(/support/) end - it 'has iiif_text_direction' do - expect(page).to match(/iiif_text_direction/) - end - it 'has uniform_title' do - expect(page).to match(/uniform_title/) - end - it 'has condition_note' do - expect(page).to match(/condition_note/) - end - it 'has commentator' do - expect(page).to match(/commentator/) - end - it 'has subject_geographic' do - expect(page).to match(/subject_geographic/) - end - it 'has subject_temporal' do - expect(page).to match(/subject_temporal/) + it 'has title' do + expect(page).to match(/title/) end it 'has translator' do expect(page).to match(/translator/) end - it 'has colophon' do - expect(page).to match(/colophon/) - end - it 'has finding_aid_url' do - expect(page).to match(/finding_aid_url/) - end - it 'has rubricator' do - expect(page).to match(/rubricator/) - end - it 'has creator' do - expect(page).to match(/creator/) - end - it 'has license' do - expect(page).to match(/license/) + it 'has uniform_title' do + expect(page).to match(/uniform_title/) end # This invokes License renderer from hyrax gem # it 'has local_rights_statement' do