diff --git a/app/assets/csv/import_manifest.csv b/app/assets/csv/import_manifest.csv index 6d9ea2dd..1bf28d47 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 +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 diff --git a/app/assets/markdown/importer_guide.md b/app/assets/markdown/importer_guide.md index a6a9eecf..fa34d682 100644 --- a/app/assets/markdown/importer_guide.md +++ b/app/assets/markdown/importer_guide.md @@ -36,6 +36,7 @@ - [IIIF Access URL](#iiif-access-url) - [IIIF Range](#iiif-range) - [Illustrations note](#illustrations-note) +- [Illustrator](#illustrator) - [Item Sequence](#item-sequence) - [Language](#language) - [License](#license) @@ -234,6 +235,10 @@ Also aaccepts: `Name.illuminator` Also accepts: `Description.illustrations` +### Illustrator + +accepts ""Illustrator", "Name.illustrator" + ### Item Sequence ### viewingHint diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index b457ef32..001f2106 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -101,7 +101,6 @@ def self.modified_field config.add_show_field 'format_tesim' config.add_show_field 'identifier_tesim' config.add_show_field 'ark_ssi', label: 'ARK' - config.add_show_field 'access_copy_ssi' config.add_show_field 'alternative_title_tesim' config.add_show_field 'architect_tesim' @@ -125,6 +124,7 @@ def self.modified_field config.add_show_field 'iiif_viewing_hint_ssi' config.add_show_field 'illuminator_tesim' config.add_show_field 'illustrations_note_tesim' + config.add_show_field 'illustrator_tesim' config.add_show_field 'location_tesim' config.add_show_field 'local_identifier_ssm' config.add_show_field 'lyricist_tesim' @@ -419,6 +419,14 @@ def self.modified_field } end + config.add_search_field('illustrator') do |field| + solr_name = solr_name('illustrator', :stored_searchable) + field.solr_local_parameters = { + qf: solr_name, + pf: solr_name + } + end + config.add_search_field('keyword') do |field| solr_name = solr_name('keyword', :stored_searchable) field.solr_local_parameters = { diff --git a/app/forms/hyrax/californica_collections_form.rb b/app/forms/hyrax/californica_collections_form.rb index 10a38808..b3432762 100644 --- a/app/forms/hyrax/californica_collections_form.rb +++ b/app/forms/hyrax/californica_collections_form.rb @@ -24,6 +24,7 @@ class CalifornicaCollectionsForm < Hyrax::Forms::CollectionForm :iiif_manifest_url, :iiif_viewing_hint, :illuminator, + :illustrator, :illustrations_note, :latitude, :longitude, diff --git a/app/forms/hyrax/work_form.rb b/app/forms/hyrax/work_form.rb index f9a0b04e..917991ef 100644 --- a/app/forms/hyrax/work_form.rb +++ b/app/forms/hyrax/work_form.rb @@ -30,6 +30,7 @@ class WorkForm < Hyrax::Forms::WorkForm :iiif_viewing_hint, :illuminator, :illustrations_note, + :illustrator, :latitude, :license, :local_identifier, diff --git a/app/importers/californica_mapper.rb b/app/importers/californica_mapper.rb index 6d6b78a2..cc9779c7 100644 --- a/app/importers/californica_mapper.rb +++ b/app/importers/californica_mapper.rb @@ -36,8 +36,9 @@ class CalifornicaMapper < Darlingtonia::HashMapper iiif_manifest_url: "IIIF Manifest URL", iiif_range: "IIIF Range", iiif_viewing_hint: "viewingHint", - illustrations_note: ["Illustrations note", "Description.illustrations"], illuminator: ["Illuminator", "Name.illuminator"], + illustrations_note: ["Illustrations note", "Description.illustrations"], + illustrator: ["Illustrator", "Name.illustrator"], language: "Language", latitude: "Description.latitude", license: "License", @@ -173,6 +174,7 @@ def ark Ark.ensure_prefix(map_field(:ark).to_a.first) end + # Only single value field need to be defined def binding_note map_field(:binding_note).to_a.first end diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index 1a1767e2..32e992b8 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -126,6 +126,10 @@ def illustrations_note self[:illustrations_note_tesim] end + def illustrator + self[:illustrator_tesim] + end + def latitude self[Solrizer.solr_name('latitude')] end diff --git a/app/models/ucla_metadata.rb b/app/models/ucla_metadata.rb index 083ddd3c..b6632632 100644 --- a/app/models/ucla_metadata.rb +++ b/app/models/ucla_metadata.rb @@ -95,6 +95,10 @@ module UclaMetadata index.as :stored_searchable end + property :illustrator, predicate: ::RDF::URI.intern('http://id.loc.gov/vocabulary/relators/ill.html') do |index| + index.as :stored_searchable + end + property :latitude, predicate: ::RDF::Vocab::EXIF.gpsLatitude do |index| index.as :stored_searchable end diff --git a/app/presenters/hyrax/californica_collection_presenter.rb b/app/presenters/hyrax/californica_collection_presenter.rb index 3164aff0..91769955 100644 --- a/app/presenters/hyrax/californica_collection_presenter.rb +++ b/app/presenters/hyrax/californica_collection_presenter.rb @@ -30,6 +30,7 @@ def self.terms :iiif_manifest_url, :iiif_range, :illustrations_note, + :illustrator, :iiif_viewing_hint, :identifier, :illuminator, diff --git a/app/presenters/hyrax/work_presenter.rb b/app/presenters/hyrax/work_presenter.rb index e9bb9965..ad7a51f1 100644 --- a/app/presenters/hyrax/work_presenter.rb +++ b/app/presenters/hyrax/work_presenter.rb @@ -28,6 +28,7 @@ class WorkPresenter < Hyrax::WorkShowPresenter :iiif_manifest_url, :iiif_range, :illustrations_note, + :illustrator, :iiif_viewing_hint, :illuminator, :license, diff --git a/app/views/hyrax/base/_attribute_rows.html.erb b/app/views/hyrax/base/_attribute_rows.html.erb index 1b67790b..98005d0c 100644 --- a/app/views/hyrax/base/_attribute_rows.html.erb +++ b/app/views/hyrax/base/_attribute_rows.html.erb @@ -31,6 +31,7 @@ <%= presenter.attribute_to_html(:iiif_viewing_hint, render_as: :iiif_viewing_hint, html_dl: true) %> <%= presenter.attribute_to_html(:illuminator, html_dl: true) %> <%= presenter.attribute_to_html(:illustrations_note, html_dl: true) %> +<%= presenter.attribute_to_html(:illustrator, html_dl: true) %> <%= presenter.attribute_to_html(:keyword, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:language, render_as: :language, html_dl: true) %> <%= presenter.attribute_to_html(:local_identifier, html_dl: true) %> diff --git a/spec/fixtures/coordinates_example.csv b/spec/fixtures/coordinates_example.csv index 3146ba40..990fba76 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,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,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 +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 diff --git a/spec/fixtures/coordinates_example_update.csv b/spec/fixtures/coordinates_example_update.csv index bdedfa3f..779f9ed7 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 -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 +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 diff --git a/spec/fixtures/csv_import/good/all_fields.csv b/spec/fixtures/csv_import/good/all_fields.csv index 8270a59e..09d821da 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 -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/ -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/ +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 diff --git a/spec/fixtures/example.csv b/spec/fixtures/example.csv index e3b74871..106b6a5c 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 -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/ +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 diff --git a/spec/fixtures/simple_example.csv b/spec/fixtures/simple_example.csv index 91b39956..a28df1ba 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 -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 +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 diff --git a/spec/forms/hyrax/work_form_spec.rb b/spec/forms/hyrax/work_form_spec.rb index b86bc0c7..e5bbcab7 100644 --- a/spec/forms/hyrax/work_form_spec.rb +++ b/spec/forms/hyrax/work_form_spec.rb @@ -31,6 +31,7 @@ :iiif_range, :illuminator, :illustrations_note, + :illustrator, :latitude, :license, :local_identifier, diff --git a/spec/importers/californica_csv_parser_spec.rb b/spec/importers/californica_csv_parser_spec.rb index 1c347bf1..f7311ed9 100644 --- a/spec/importers/californica_csv_parser_spec.rb +++ b/spec/importers/californica_csv_parser_spec.rb @@ -132,7 +132,9 @@ 'Rubricator', 'Name.rubricator', 'Name.creator', - 'License'] + 'License', + 'Illustrator', + 'Name.illustrator'] 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 b57e4175..0349caf8 100644 --- a/spec/importers/californica_mapper_spec.rb +++ b/spec/importers/californica_mapper_spec.rb @@ -167,6 +167,7 @@ :iiif_manifest_url, :iiif_viewing_hint, :illuminator, + :illustrator, :language, :license, :latitude, diff --git a/spec/system/edit_collection_spec.rb b/spec/system/edit_collection_spec.rb index 86afe909..398a5075 100644 --- a/spec/system/edit_collection_spec.rb +++ b/spec/system/edit_collection_spec.rb @@ -33,6 +33,7 @@ iiif_range: 'Old IIIF Range', illuminator: ['Old Illuminator'], illustrations_note: ['Old Illustrations note'], + illustrator: ['Old Illustrator'], language: ['ang'], latitude: ['Old Lat'], longitude: ['Old Long'], @@ -155,6 +156,7 @@ 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('Local rights statement').value).to eq 'Old Rights statement local' # # # Edit some fields in the form diff --git a/spec/system/edit_work_spec.rb b/spec/system/edit_work_spec.rb index 496f8b69..b3f37194 100644 --- a/spec/system/edit_work_spec.rb +++ b/spec/system/edit_work_spec.rb @@ -26,6 +26,7 @@ iiif_viewing_hint: 'Old Iiif viewing hint', iiif_range: 'Old Iiif range', illustrations_note: ['Old Illustrations note'], + illustrator: ['Old Illustrator'], language: ['ang'], latitude: ['Old Lat'], local_identifier: ['Old Local ID'], @@ -133,8 +134,8 @@ expect(find_field('Collation').value).to eq 'Old Collation' expect(find_field('Composer').value).to eq 'Old Composer' expect(find_field('Foliation').value).to eq 'Old Foliation note' - expect(find_field('Lyricist').value).to eq 'Old Lyricist' expect(find_field('Illuminator').value).to eq 'Old Illuminator' + expect(find_field('Lyricist').value).to eq 'Old Lyricist' expect(find_field('Scribe').value).to eq 'Old Scribe' expect(find_field('Condition note').value).to eq 'Old Condition note' expect(find_field('Masthead parameters').value).to eq 'Old Masthead Parameters' diff --git a/spec/system/import_and_show_work_spec.rb b/spec/system/import_and_show_work_spec.rb index 0f47aa17..339b984f 100644 --- a/spec/system/import_and_show_work_spec.rb +++ b/spec/system/import_and_show_work_spec.rb @@ -75,6 +75,7 @@ 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 "history-description" # provenance expect(page).to have_content "table of contents" # toc expect(page).to have_content "concept-topic" # subject_topic diff --git a/spec/system/show_collection_spec.rb b/spec/system/show_collection_spec.rb index d6801336..78e14a87 100644 --- a/spec/system/show_collection_spec.rb +++ b/spec/system/show_collection_spec.rb @@ -24,6 +24,7 @@ iiif_range: 'Old Iiif range', iiif_viewing_hint: 'Old Iiif viewing hint', illustrations_note: ['Old Illustrations note'], + illustrator: ['Old Illustrator'], language: ['ang'], latitude: ['Old Lat'], longitude: ['Old Long'], diff --git a/spec/uploaders/csv_manifest_validator_spec.rb b/spec/uploaders/csv_manifest_validator_spec.rb index 4d3579f5..44fb6557 100644 --- a/spec/uploaders/csv_manifest_validator_spec.rb +++ b/spec/uploaders/csv_manifest_validator_spec.rb @@ -196,6 +196,8 @@ "IIIF Range", "Illuminator", "Illustrations note", + "Illustrator", + "Name.illustrator", "Item ARK", "Item Sequence", "Language", 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 76e5f46d..64e6e2d2 100644 --- a/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb +++ b/spec/views/hyrax/base/_attribute_rows.html.erb_spec.rb @@ -23,6 +23,7 @@ funding_note: ['funding_note'], genre: ['genre'], iiif_viewing_hint: 'iiif_viewing_hint', + illustrator: ['illustrator'], location: ['location'], latitude: ['latitude'], local_identifier: ['local'], @@ -85,6 +86,9 @@ it 'has iiif_viewing_hint' do expect(page).to match(/iiif_viewing_hint/) end + it 'has illustrator' do + expect(page).to match(/illustrator/) + end it 'has latitude' do expect(page).to match(/latitude/) end