From ea392ccf5d3c98199065b7c7bde78118c5c6075e Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 14:50:47 -0400 Subject: [PATCH 1/6] [ESSI-2022] drop deprecated num_pages metadata module --- app/models/archival_material.rb | 1 - app/models/bib_record.rb | 1 - app/models/concerns/essi/num_pages_metadata.rb | 8 -------- app/models/image.rb | 1 - app/models/paged_resource.rb | 1 - app/models/scientific.rb | 1 - 6 files changed, 13 deletions(-) delete mode 100644 app/models/concerns/essi/num_pages_metadata.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index 9c581d203..5a02b7052 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -5,7 +5,6 @@ class ArchivalMaterial < ActiveFedora::Base include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable - # include ESSI::NumPagesMetadata include ESSI::NumPagesBehavior include ESSI::OCRBehavior # include ESSI::OCRMetadata diff --git a/app/models/bib_record.rb b/app/models/bib_record.rb index c757d465f..0f5b218cb 100644 --- a/app/models/bib_record.rb +++ b/app/models/bib_record.rb @@ -5,7 +5,6 @@ class BibRecord < ActiveFedora::Base include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable - # include ESSI::NumPagesMetadata include ESSI::NumPagesBehavior include ESSI::OCRBehavior # include ESSI::OCRMetadata diff --git a/app/models/concerns/essi/num_pages_metadata.rb b/app/models/concerns/essi/num_pages_metadata.rb deleted file mode 100644 index 6f90a1a36..000000000 --- a/app/models/concerns/essi/num_pages_metadata.rb +++ /dev/null @@ -1,8 +0,0 @@ -module ESSI - module NumPagesMetadata - extend ActiveSupport::Concern - included do - property :num_pages, predicate: ::RDF::Vocab::BIBO.numPages, multiple: false - end - end -end diff --git a/app/models/image.rb b/app/models/image.rb index 4b683a239..0c1f878d0 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -5,7 +5,6 @@ class Image < ActiveFedora::Base include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable - # include ESSI::NumPagesMetadata include ESSI::NumPagesBehavior include ESSI::OCRBehavior # include ESSI::OCRMetadata diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index 95ada48b1..d3bfb9299 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -5,7 +5,6 @@ class PagedResource < ActiveFedora::Base include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable - # include ESSI::NumPagesMetadata include ESSI::NumPagesBehavior include ESSI::OCRBehavior # include ESSI::OCRMetadata diff --git a/app/models/scientific.rb b/app/models/scientific.rb index 5fa60223a..cd0b9d219 100644 --- a/app/models/scientific.rb +++ b/app/models/scientific.rb @@ -5,7 +5,6 @@ class Scientific < ActiveFedora::Base include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable - # include ESSI::NumPagesMetadata include ESSI::NumPagesBehavior include ESSI::OCRBehavior # include ESSI::OCRMetadata From 03e356becb6f8ad122c5b6b937ff4d4e98dd5d55 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 14:51:36 -0400 Subject: [PATCH 2/6] [ESSI-2022] drop deprecated ocr metadata module --- app/models/archival_material.rb | 1 - app/models/bib_record.rb | 1 - app/models/concerns/essi/ocr_metadata.rb | 10 ---------- app/models/image.rb | 1 - app/models/paged_resource.rb | 1 - app/models/scientific.rb | 1 - 6 files changed, 15 deletions(-) delete mode 100644 app/models/concerns/essi/ocr_metadata.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index 5a02b7052..df5b0dee2 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -7,7 +7,6 @@ class ArchivalMaterial < ActiveFedora::Base include ExtraLockable include ESSI::NumPagesBehavior include ESSI::OCRBehavior - # include ESSI::OCRMetadata include ESSI::PDFBehavior #include ESSI::PDFMetadata include ESSI::PDFDefaultDownloadable diff --git a/app/models/bib_record.rb b/app/models/bib_record.rb index 0f5b218cb..050d8e777 100644 --- a/app/models/bib_record.rb +++ b/app/models/bib_record.rb @@ -7,7 +7,6 @@ class BibRecord < ActiveFedora::Base include ExtraLockable include ESSI::NumPagesBehavior include ESSI::OCRBehavior - # include ESSI::OCRMetadata self.indexer = BibRecordIndexer # Change this to restrict which works can be added as a child. diff --git a/app/models/concerns/essi/ocr_metadata.rb b/app/models/concerns/essi/ocr_metadata.rb deleted file mode 100644 index 9d5a41a5e..000000000 --- a/app/models/concerns/essi/ocr_metadata.rb +++ /dev/null @@ -1,10 +0,0 @@ -module ESSI - module OCRMetadata - extend ActiveSupport::Concern - included do - property :ocr_state, predicate: ::RDF::URI.new('http://dlib.indiana.edu/vocabulary/OCRState'), multiple: false do |index| - index.as :stored_searchable - end - end - end -end diff --git a/app/models/image.rb b/app/models/image.rb index 0c1f878d0..949c6a576 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -7,7 +7,6 @@ class Image < ActiveFedora::Base include ExtraLockable include ESSI::NumPagesBehavior include ESSI::OCRBehavior - # include ESSI::OCRMetadata self.indexer = ImageIndexer # Change this to restrict which works can be added as a child. diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index d3bfb9299..e369b555d 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -7,7 +7,6 @@ class PagedResource < ActiveFedora::Base include ExtraLockable include ESSI::NumPagesBehavior include ESSI::OCRBehavior - # include ESSI::OCRMetadata include ESSI::PDFBehavior # include ESSI::PDFMetadata diff --git a/app/models/scientific.rb b/app/models/scientific.rb index cd0b9d219..601a572a2 100644 --- a/app/models/scientific.rb +++ b/app/models/scientific.rb @@ -7,7 +7,6 @@ class Scientific < ActiveFedora::Base include ExtraLockable include ESSI::NumPagesBehavior include ESSI::OCRBehavior - # include ESSI::OCRMetadata self.indexer = ScientificIndexer # Change this to restrict which works can be added as a child. From f47849500f310b68b7f9686e5cc7188bdcb01b9a Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 14:52:38 -0400 Subject: [PATCH 3/6] [ESSI-2022] drop deprecated pdf metadata module --- app/models/archival_material.rb | 1 - app/models/concerns/essi/pdf_metadata.rb | 10 ---------- app/models/paged_resource.rb | 1 - 3 files changed, 12 deletions(-) delete mode 100644 app/models/concerns/essi/pdf_metadata.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index df5b0dee2..2a677392d 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -8,7 +8,6 @@ class ArchivalMaterial < ActiveFedora::Base include ESSI::NumPagesBehavior include ESSI::OCRBehavior include ESSI::PDFBehavior - #include ESSI::PDFMetadata include ESSI::PDFDefaultDownloadable self.indexer = ArchivalMaterialIndexer diff --git a/app/models/concerns/essi/pdf_metadata.rb b/app/models/concerns/essi/pdf_metadata.rb deleted file mode 100644 index d49e599e0..000000000 --- a/app/models/concerns/essi/pdf_metadata.rb +++ /dev/null @@ -1,10 +0,0 @@ -module ESSI - module PDFMetadata - extend ActiveSupport::Concern - included do - property :pdf_state, predicate: ::RDF::URI.new('http://dlib.indiana.edu/vocabulary/PDFState'), multiple: false do |index| - index.as :stored_searchable - end - end - end -end diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index e369b555d..7f6146c6b 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -8,7 +8,6 @@ class PagedResource < ActiveFedora::Base include ESSI::NumPagesBehavior include ESSI::OCRBehavior include ESSI::PDFBehavior - # include ESSI::PDFMetadata self.indexer = PagedResourceIndexer # Change this to restrict which works can be added as a child. From eb8988d32e64dd54793212e80f5cbd3454c275c1 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 14:55:30 -0400 Subject: [PATCH 4/6] [ESSI-2022] drop extended metadata module --- app/models/archival_material.rb | 3 - app/models/bib_record.rb | 3 - app/models/concerns/essi/extended_metadata.rb | 302 ------------------ app/models/image.rb | 3 - app/models/paged_resource.rb | 3 - app/models/scientific.rb | 3 - lib/generators/hyrax/work/work_generator.rb | 2 - 7 files changed, 319 deletions(-) delete mode 100644 app/models/concerns/essi/extended_metadata.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index 2a677392d..2c987ba90 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -15,9 +15,6 @@ class ArchivalMaterial < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # Include extended metadata common to most Work Types - # include ESSI::ExtendedMetadata - # This model includes metadata properties specific to the ArchivalMaterial Work Type # include ESSI::ArchivalMaterialMetadata diff --git a/app/models/bib_record.rb b/app/models/bib_record.rb index 050d8e777..b5591cf3d 100644 --- a/app/models/bib_record.rb +++ b/app/models/bib_record.rb @@ -13,9 +13,6 @@ class BibRecord < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # Include extended metadata common to most Work Types - # include ESSI::ExtendedMetadata - # This model includes metadata properties specific to the BibRecord Work Type # include ESSI::BibRecordMetadata diff --git a/app/models/concerns/essi/extended_metadata.rb b/app/models/concerns/essi/extended_metadata.rb deleted file mode 100644 index fcaae692d..000000000 --- a/app/models/concerns/essi/extended_metadata.rb +++ /dev/null @@ -1,302 +0,0 @@ -module ESSI - - module ExtendedMetadata - extend ActiveSupport::Concern - - included do - property :holding_location, - predicate: RDF::Vocab::BF2.heldBy, - multiple: false do |index| - index.as :stored_searchable, :facetable - end - property :series, - predicate: RDF::Vocab::BF2.seriesStatement do |index| - index.as :stored_searchable, :facetable - end - - property :physical_description, - predicate: RDF::Vocab::MODS.physicalExtent, - multiple: false - - property :campus, - predicate: RDF::Vocab::MARCRelators.uvp, - multiple: false do |index| - index.as :stored_searchable, :facetable - end - - property :rights_note, predicate: 'http://purl.org/dc/elements/1.1/rights' - - property :abridger, predicate: RDF::Vocab::MARCRelators.abr - property :actor, predicate: RDF::Vocab::MARCRelators.act - property :adapter, predicate: RDF::Vocab::MARCRelators.adp - property :addressee, predicate: RDF::Vocab::MARCRelators.rcp - property :analyst, predicate: RDF::Vocab::MARCRelators.anl - property :animator, predicate: RDF::Vocab::MARCRelators.anm - property :annotator, predicate: RDF::Vocab::MARCRelators.ann - property :appellant, predicate: RDF::Vocab::MARCRelators.apl - property :appellee, predicate: RDF::Vocab::MARCRelators.ape - property :applicant, predicate: RDF::Vocab::MARCRelators.app - property :architect, predicate: RDF::Vocab::MARCRelators.arc - property :arranger, predicate: RDF::Vocab::MARCRelators.arr - property :art_copyist, predicate: RDF::Vocab::MARCRelators.acp - property :art_director, predicate: RDF::Vocab::MARCRelators.adi - property :artist, predicate: RDF::Vocab::MARCRelators.art - property :artistic_director, predicate: RDF::Vocab::MARCRelators.ard - property :assignee, predicate: RDF::Vocab::MARCRelators.asg - property :associated_name, predicate: RDF::Vocab::MARCRelators.asn - property :attributed_name, predicate: RDF::Vocab::MARCRelators.att - property :auctioneer, predicate: RDF::Vocab::MARCRelators.auc - property :author, predicate: RDF::Vocab::MARCRelators.aut - property :author_in_quotations_or_text_abstracts, - predicate: RDF::Vocab::MARCRelators.aqt - property :author_of_afterword_colophon_etc, - predicate: RDF::Vocab::MARCRelators.aft - property :author_of_dialog, predicate: RDF::Vocab::MARCRelators.aud - property :author_of_introduction_etc, - predicate: RDF::Vocab::MARCRelators.aui - property :autographer, predicate: RDF::Vocab::MARCRelators.ato - property :bibliographic_antecedent, predicate: RDF::Vocab::MARCRelators.ant - property :binder, predicate: RDF::Vocab::MARCRelators.bnd - property :binding_designer, predicate: RDF::Vocab::MARCRelators.bdd - property :blurb_writer, predicate: RDF::Vocab::MARCRelators.blw - property :book_designer, predicate: RDF::Vocab::MARCRelators.bkd - property :book_producer, predicate: RDF::Vocab::MARCRelators.bkp - property :bookjacket_designer, predicate: RDF::Vocab::MARCRelators.bjd - property :bookplate_designer, predicate: RDF::Vocab::MARCRelators.bpd - property :bookseller, predicate: RDF::Vocab::MARCRelators.bsl - property :braille_embosser, predicate: RDF::Vocab::MARCRelators.brl - property :broadcaster, predicate: RDF::Vocab::MARCRelators.brd - property :calligrapher, predicate: RDF::Vocab::MARCRelators.cll - property :cartographer, predicate: RDF::Vocab::MARCRelators.ctg - property :caster, predicate: RDF::Vocab::MARCRelators.cas - property :censor, predicate: RDF::Vocab::MARCRelators.cns - property :choreographer, predicate: RDF::Vocab::MARCRelators.chr - property :cinematographer, predicate: RDF::Vocab::MARCRelators.cng - property :client, predicate: RDF::Vocab::MARCRelators.cli - property :collection_registrar, predicate: RDF::Vocab::MARCRelators.cor - property :collector, predicate: RDF::Vocab::MARCRelators.col - property :collotyper, predicate: RDF::Vocab::MARCRelators.clt - property :colorist, predicate: RDF::Vocab::MARCRelators.clr - property :commentator, predicate: RDF::Vocab::MARCRelators.cmm - property :commentator_for_written_text, - predicate: RDF::Vocab::MARCRelators.cwt - property :compiler, predicate: RDF::Vocab::MARCRelators.com - property :complainant, predicate: RDF::Vocab::MARCRelators.cpl - property :complainant_appellant, predicate: RDF::Vocab::MARCRelators.cpt - property :complainant_appellee, predicate: RDF::Vocab::MARCRelators.cpe - property :composer, predicate: RDF::Vocab::MARCRelators.cmp - property :compositor, predicate: RDF::Vocab::MARCRelators.cmt - property :conceptor, predicate: RDF::Vocab::MARCRelators.ccp - property :conductor, predicate: RDF::Vocab::MARCRelators.cnd - property :conservator, predicate: RDF::Vocab::MARCRelators.con - property :consultant, predicate: RDF::Vocab::MARCRelators.csl - property :consultant_to_a_project, predicate: RDF::Vocab::MARCRelators.csp - property :contestant, predicate: RDF::Vocab::MARCRelators.cos - property :contestant_appellant, predicate: RDF::Vocab::MARCRelators.cot - property :contestant_appellee, predicate: RDF::Vocab::MARCRelators.coe - property :contestee, predicate: RDF::Vocab::MARCRelators.cts - property :contestee_appellant, predicate: RDF::Vocab::MARCRelators.ctt - property :contestee_appellee, predicate: RDF::Vocab::MARCRelators.cte - property :contractor, predicate: RDF::Vocab::MARCRelators.ctr - property :copyright_claimant, predicate: RDF::Vocab::MARCRelators.cpc - property :copyright_holder, predicate: RDF::Vocab::MARCRelators.cph - property :corrector, predicate: RDF::Vocab::MARCRelators.crr - property :correspondent, predicate: RDF::Vocab::MARCRelators.crp - property :costume_designer, predicate: RDF::Vocab::MARCRelators.cst - property :court_governed, predicate: RDF::Vocab::MARCRelators.cou - property :court_reporter, predicate: RDF::Vocab::MARCRelators.crt - property :cover_designer, predicate: RDF::Vocab::MARCRelators.cov - property :curator, predicate: RDF::Vocab::MARCRelators.cur - property :dancer, predicate: RDF::Vocab::MARCRelators.dnc - property :data_contributor, predicate: RDF::Vocab::MARCRelators.dtc - property :data_manager, predicate: RDF::Vocab::MARCRelators.dtm - property :dedicatee, predicate: RDF::Vocab::MARCRelators.dte - property :dedicator, predicate: RDF::Vocab::MARCRelators.dto - property :defendant, predicate: RDF::Vocab::MARCRelators.dfd - property :defendant_appellant, predicate: RDF::Vocab::MARCRelators.dft - property :defendant_appellee, predicate: RDF::Vocab::MARCRelators.dfe - property :degree_granting_institution, predicate: RDF::Vocab::MARCRelators.dgg - property :degree_supervisor, predicate: RDF::Vocab::MARCRelators.dgs - property :delineator, predicate: RDF::Vocab::MARCRelators.dln - property :depicted, predicate: RDF::Vocab::MARCRelators.dpc - property :designer, predicate: RDF::Vocab::MARCRelators.dsr - property :director, predicate: RDF::Vocab::MARCRelators.drt - property :dissertant, predicate: RDF::Vocab::MARCRelators.dis - property :distribution_place, predicate: RDF::Vocab::MARCRelators.dbp - property :distributor, predicate: RDF::Vocab::MARCRelators.dst - property :owning_institution, predicate: RDF::Vocab::MARCRelators.dnr - property :draftsman, predicate: RDF::Vocab::MARCRelators.drm - property :dubious_author, predicate: RDF::Vocab::MARCRelators.dub - property :editor, predicate: RDF::Vocab::MARCRelators.edt - property :editor_of_compilation, predicate: RDF::Vocab::MARCRelators.edc - property :editor_of_moving_image_work, predicate: RDF::Vocab::MARCRelators.edm - property :electrician, predicate: RDF::Vocab::MARCRelators.elg - property :electrotyper, predicate: RDF::Vocab::MARCRelators.elt - property :enacting_jurisdiction, predicate: RDF::Vocab::MARCRelators.enj - property :engineer, predicate: RDF::Vocab::MARCRelators.eng - property :engraver, predicate: RDF::Vocab::MARCRelators.egr - property :etcher, predicate: RDF::Vocab::MARCRelators.etr - property :event_place, predicate: RDF::Vocab::MARCRelators.evp - property :expert, predicate: RDF::Vocab::MARCRelators.exp - property :facsimilist, predicate: RDF::Vocab::MARCRelators.fac - property :field_director, predicate: RDF::Vocab::MARCRelators.fld - property :film_distributor, predicate: RDF::Vocab::MARCRelators.fds - property :film_director, predicate: RDF::Vocab::MARCRelators.fmd - property :film_editor, predicate: RDF::Vocab::MARCRelators.flm - property :film_producer, predicate: RDF::Vocab::MARCRelators.fmp - property :filmmaker, predicate: RDF::Vocab::MARCRelators.fmk - property :first_party, predicate: RDF::Vocab::MARCRelators.fpy - property :forger, predicate: RDF::Vocab::MARCRelators.frg - property :former_owner, predicate: RDF::Vocab::MARCRelators.fmo - property :funding, predicate: RDF::Vocab::MARCRelators.fnd - property :geographic_information_specialist, - predicate: RDF::Vocab::MARCRelators.gis - property :honoree, predicate: RDF::Vocab::MARCRelators.hnr - property :host, predicate: RDF::Vocab::MARCRelators.hst - property :host_institution, predicate: RDF::Vocab::MARCRelators.his - property :illuminator, predicate: RDF::Vocab::MARCRelators.ilu - property :illustrator, predicate: RDF::Vocab::MARCRelators.ill - property :inscriber, predicate: RDF::Vocab::MARCRelators.ins - property :instrumentalist, predicate: RDF::Vocab::MARCRelators.itr - property :interviewee, predicate: RDF::Vocab::MARCRelators.ive - property :interviewer, predicate: RDF::Vocab::MARCRelators.ivr - property :author, predicate: RDF::Vocab::MARCRelators.inv - property :issuing_body, predicate: RDF::Vocab::MARCRelators.isb - property :judge, predicate: RDF::Vocab::MARCRelators.jud - property :jurisdiction_governed, predicate: RDF::Vocab::MARCRelators.jug - property :laboratory, predicate: RDF::Vocab::MARCRelators.lbr - property :laboratory_director, predicate: RDF::Vocab::MARCRelators.ldr - property :landscape_architect, predicate: RDF::Vocab::MARCRelators.lsa - property :lead, predicate: RDF::Vocab::MARCRelators.led - property :lender, predicate: RDF::Vocab::MARCRelators.len - property :libelant, predicate: RDF::Vocab::MARCRelators.lil - property :libelant_appellant, predicate: RDF::Vocab::MARCRelators.lit - property :libelant_appellee, predicate: RDF::Vocab::MARCRelators.lie - property :libelee, predicate: RDF::Vocab::MARCRelators.lel - property :libelee_appellant, predicate: RDF::Vocab::MARCRelators.let - property :libelee_appellee, predicate: RDF::Vocab::MARCRelators.lee - property :librettist, predicate: RDF::Vocab::MARCRelators.lbt - property :licensee, predicate: RDF::Vocab::MARCRelators.lse - property :licensor, predicate: RDF::Vocab::MARCRelators.lso - property :lighting_designer, predicate: RDF::Vocab::MARCRelators.lgd - property :lithographer, predicate: RDF::Vocab::MARCRelators.ltg - property :lyricist, predicate: RDF::Vocab::MARCRelators.lyr - property :manufacture_place, predicate: RDF::Vocab::MARCRelators.mfp - property :manufacturer, predicate: RDF::Vocab::MARCRelators.mfr - property :marbler, predicate: RDF::Vocab::MARCRelators.mrb - property :markup_editor, predicate: RDF::Vocab::MARCRelators.mrk - property :medium, predicate: RDF::Vocab::MARCRelators.med - property :metadata_contact, predicate: RDF::Vocab::MARCRelators.mdc - property :metal_engraver, predicate: RDF::Vocab::MARCRelators.mte - property :minute_taker, predicate: RDF::Vocab::MARCRelators.mtk - property :moderator, predicate: RDF::Vocab::MARCRelators.mod - property :monitor, predicate: RDF::Vocab::MARCRelators.mon - property :music_copyist, predicate: RDF::Vocab::MARCRelators.mcp - property :musical_director, predicate: RDF::Vocab::MARCRelators.msd - property :musician, predicate: RDF::Vocab::MARCRelators.mus - property :narrator, predicate: RDF::Vocab::MARCRelators.nrt - property :onscreen_presenter, predicate: RDF::Vocab::MARCRelators.osp - property :opponent, predicate: RDF::Vocab::MARCRelators.opn - property :organizer, predicate: RDF::Vocab::MARCRelators.orm - property :originator, predicate: RDF::Vocab::MARCRelators.org - property :other, predicate: RDF::Vocab::MARCRelators.oth - property :owner, predicate: RDF::Vocab::MARCRelators.own - property :panelist, predicate: RDF::Vocab::MARCRelators.pan - property :papermaker, predicate: RDF::Vocab::MARCRelators.ppm - property :patent_applicant, predicate: RDF::Vocab::MARCRelators.pta - property :patent_holder, predicate: RDF::Vocab::MARCRelators.pth - property :patron, predicate: RDF::Vocab::MARCRelators.pat - property :performer, predicate: RDF::Vocab::MARCRelators.prf - property :permitting_agency, predicate: RDF::Vocab::MARCRelators.pma - property :photographer, predicate: RDF::Vocab::MARCRelators.pht - property :plaintiff, predicate: RDF::Vocab::MARCRelators.ptf - property :plaintiff_appellant, predicate: RDF::Vocab::MARCRelators.ptt - property :plaintiff_appellee, predicate: RDF::Vocab::MARCRelators.pte - property :platemaker, predicate: RDF::Vocab::MARCRelators.plt - property :praeses, predicate: RDF::Vocab::MARCRelators.pra - property :presenter, predicate: RDF::Vocab::MARCRelators.pre - property :printer, predicate: RDF::Vocab::MARCRelators.prt - property :printer_of_plates, predicate: RDF::Vocab::MARCRelators.pop - property :printmaker, predicate: RDF::Vocab::MARCRelators.prm - property :process_contact, predicate: RDF::Vocab::MARCRelators.prc - property :producer, predicate: RDF::Vocab::MARCRelators.pro - property :production_company, predicate: RDF::Vocab::MARCRelators.prn - property :production_designer, predicate: RDF::Vocab::MARCRelators.prs - property :production_manager, predicate: RDF::Vocab::MARCRelators.pmn - property :production_personnel, predicate: RDF::Vocab::MARCRelators.prd - property :production_place, predicate: RDF::Vocab::MARCRelators.prp - property :programmer, predicate: RDF::Vocab::MARCRelators.prg - property :project_director, predicate: RDF::Vocab::MARCRelators.pdr - property :proofreader, predicate: RDF::Vocab::MARCRelators.pfr - property :provider, predicate: RDF::Vocab::MARCRelators.prv - property :publication_place, predicate: RDF::Vocab::MARCRelators.pup - property :publishing_director, predicate: RDF::Vocab::MARCRelators.pbd - property :puppeteer, predicate: RDF::Vocab::MARCRelators.ppt - property :radio_director, predicate: RDF::Vocab::MARCRelators.rdd - property :radio_producer, predicate: RDF::Vocab::MARCRelators.rpc - property :recording_engineer, predicate: RDF::Vocab::MARCRelators.rce - property :recordist, predicate: RDF::Vocab::MARCRelators.rcd - property :redaktor, predicate: RDF::Vocab::MARCRelators.red - property :renderer, predicate: RDF::Vocab::MARCRelators.ren - property :reporter, predicate: RDF::Vocab::MARCRelators.rpt - property :marc_repository, predicate: RDF::Vocab::MARCRelators.rps - property :research_team_head, predicate: RDF::Vocab::MARCRelators.rth - property :research_team_member, predicate: RDF::Vocab::MARCRelators.rtm - property :researcher, predicate: RDF::Vocab::MARCRelators.res - property :respondent, predicate: RDF::Vocab::MARCRelators.rsp - property :respondent_appellant, predicate: RDF::Vocab::MARCRelators.rst - property :respondent_appellee, predicate: RDF::Vocab::MARCRelators.rse - property :responsible_party, predicate: RDF::Vocab::MARCRelators.rpy - property :restager, predicate: RDF::Vocab::MARCRelators.rsg - property :restorationist, predicate: RDF::Vocab::MARCRelators.rsr - property :reviewer, predicate: RDF::Vocab::MARCRelators.rev - property :rubricator, predicate: RDF::Vocab::MARCRelators.rbr - property :scenarist, predicate: RDF::Vocab::MARCRelators.sce - property :scientific_advisor, predicate: RDF::Vocab::MARCRelators.sad - property :screenwriter, predicate: RDF::Vocab::MARCRelators.aus - property :scribe, predicate: RDF::Vocab::MARCRelators.scr - property :sculptor, predicate: RDF::Vocab::MARCRelators.scl - property :second_party, predicate: RDF::Vocab::MARCRelators.spy - property :secretary, predicate: RDF::Vocab::MARCRelators.sec - property :seller, predicate: RDF::Vocab::MARCRelators.sll - property :set_designer, predicate: RDF::Vocab::MARCRelators.std - property :setting, predicate: RDF::Vocab::MARCRelators.stg - property :signer, predicate: RDF::Vocab::MARCRelators.sgn - property :singer, predicate: RDF::Vocab::MARCRelators.sng - property :sound_designer, predicate: RDF::Vocab::MARCRelators.sds - property :speaker, predicate: RDF::Vocab::MARCRelators.spk - property :sponsor, predicate: RDF::Vocab::MARCRelators.spn - property :stage_director, predicate: RDF::Vocab::MARCRelators.sgd - property :stage_manager, predicate: RDF::Vocab::MARCRelators.stm - property :standards_body, predicate: RDF::Vocab::MARCRelators.stn - property :stereotyper, predicate: RDF::Vocab::MARCRelators.str - property :storyteller, predicate: RDF::Vocab::MARCRelators.stl - property :supporting_host, predicate: RDF::Vocab::MARCRelators.sht - property :surveyor, predicate: RDF::Vocab::MARCRelators.srv - property :teacher, predicate: RDF::Vocab::MARCRelators.tch - property :technical_director, predicate: RDF::Vocab::MARCRelators.tcd - property :television_director, predicate: RDF::Vocab::MARCRelators.tld - property :television_producer, predicate: RDF::Vocab::MARCRelators.tlp - property :thesis_advisor, predicate: RDF::Vocab::MARCRelators.ths - property :transcriber, predicate: RDF::Vocab::MARCRelators.trc - property :translator, predicate: RDF::Vocab::MARCRelators.trl - property :type_designer, predicate: RDF::Vocab::MARCRelators.tyd - property :typographer, predicate: RDF::Vocab::MARCRelators.tyg - property :videographer, predicate: RDF::Vocab::MARCRelators.vdg - property :voice_actor, predicate: RDF::Vocab::MARCRelators.vac - property :witness, predicate: RDF::Vocab::MARCRelators.wit - property :wood_engraver, predicate: RDF::Vocab::MARCRelators.wde - property :woodcutter, predicate: RDF::Vocab::MARCRelators.wdc - property :writer_of_accompanying_material, - predicate: RDF::Vocab::MARCRelators.wam - property :writer_of_added_commentary, - predicate: RDF::Vocab::MARCRelators.wac - property :writer_of_added_text, predicate: RDF::Vocab::MARCRelators.wat - property :writer_of_added_lyrics, predicate: RDF::Vocab::MARCRelators.wal - property :writer_of_supplementary_textual_content, - predicate: RDF::Vocab::MARCRelators.wst - property :writer_of_introduction, predicate: RDF::Vocab::MARCRelators.win - property :writer_of_preface, predicate: RDF::Vocab::MARCRelators.wpr - end - end -end diff --git a/app/models/image.rb b/app/models/image.rb index 949c6a576..57dcc42ea 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -13,9 +13,6 @@ class Image < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # Include extended metadata common to most Work Types - # include ESSI::ExtendedMetadata - # This model includes metadata properties specific to the Image Work Type # include ESSI::ImageMetadata diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index 7f6146c6b..499eac700 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -14,9 +14,6 @@ class PagedResource < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # Include extended metadata common to most Work Types - # include ESSI::ExtendedMetadata - # This model includes metadata properties specific to the PagedResource Work Type # include ESSI::PagedResourceMetadata diff --git a/app/models/scientific.rb b/app/models/scientific.rb index 601a572a2..3a502db73 100644 --- a/app/models/scientific.rb +++ b/app/models/scientific.rb @@ -13,9 +13,6 @@ class Scientific < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # Include extended metadata common to most Work Types - # include ESSI::ExtendedMetadata - # This model includes metadata properties specific to the Scientific Work Type # include ESSI::ScientificMetadata diff --git a/lib/generators/hyrax/work/work_generator.rb b/lib/generators/hyrax/work/work_generator.rb index 9d1cd265f..4a88739ca 100644 --- a/lib/generators/hyrax/work/work_generator.rb +++ b/lib/generators/hyrax/work/work_generator.rb @@ -197,8 +197,6 @@ def registration_path_symbol end def metadata_mixin - "\n # Include extended metadata common to most Work Types\n" \ - " include ESSI::ExtendedMetadata\n" \ "\n # This model includes metadata properties specific to the #{@archetype_name} Work Type\n" \ " include ESSI::#{@archetype_name}Metadata\n" end From ab5e2a90bddf18bb86bed58075dd2d10f9ee7235 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 15:00:04 -0400 Subject: [PATCH 5/6] [ESSI-2022] drop worktype-specific metadata modules --- app/models/archival_material.rb | 3 - app/models/bib_record.rb | 3 - .../essi/archival_material_metadata.rb | 11 -- .../concerns/essi/bib_record_metadata.rb | 11 -- app/models/concerns/essi/image_metadata.rb | 10 - .../concerns/essi/paged_resource_metadata.rb | 11 -- .../concerns/essi/scientific_metadata.rb | 184 ------------------ app/models/image.rb | 3 - app/models/paged_resource.rb | 3 - app/models/scientific.rb | 3 - lib/generators/hyrax/work/work_generator.rb | 3 +- 11 files changed, 1 insertion(+), 244 deletions(-) delete mode 100644 app/models/concerns/essi/archival_material_metadata.rb delete mode 100644 app/models/concerns/essi/bib_record_metadata.rb delete mode 100644 app/models/concerns/essi/image_metadata.rb delete mode 100644 app/models/concerns/essi/paged_resource_metadata.rb delete mode 100644 app/models/concerns/essi/scientific_metadata.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index 2c987ba90..6cff96293 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -15,9 +15,6 @@ class ArchivalMaterial < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # This model includes metadata properties specific to the ArchivalMaterial Work Type - # include ESSI::ArchivalMaterialMetadata - # Include properties for remote metadata lookup include ESSI::RemoteLookupMetadata diff --git a/app/models/bib_record.rb b/app/models/bib_record.rb index b5591cf3d..3e39acb10 100644 --- a/app/models/bib_record.rb +++ b/app/models/bib_record.rb @@ -13,9 +13,6 @@ class BibRecord < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # This model includes metadata properties specific to the BibRecord Work Type - # include ESSI::BibRecordMetadata - # Include properties for remote metadata lookup include ESSI::RemoteLookupMetadata diff --git a/app/models/concerns/essi/archival_material_metadata.rb b/app/models/concerns/essi/archival_material_metadata.rb deleted file mode 100644 index 1155c4c9a..000000000 --- a/app/models/concerns/essi/archival_material_metadata.rb +++ /dev/null @@ -1,11 +0,0 @@ -module ESSI - module ArchivalMaterialMetadata - extend ActiveSupport::Concern - - included do - # Add properties that would only be appropriate for use in objects of the Archival Material Work Type - property :viewing_hint, predicate: ::RDF::Vocab::IIIF.viewingHint, multiple: false - property :viewing_direction, predicate: ::RDF::Vocab::IIIF.viewingDirection, multiple: false - end - end -end diff --git a/app/models/concerns/essi/bib_record_metadata.rb b/app/models/concerns/essi/bib_record_metadata.rb deleted file mode 100644 index e1c508a02..000000000 --- a/app/models/concerns/essi/bib_record_metadata.rb +++ /dev/null @@ -1,11 +0,0 @@ -module ESSI - module BibRecordMetadata - extend ActiveSupport::Concern - - included do - # Add properties that would only be appropriate for use in objects of the BibRecord Work Type - property :bib_editor, predicate: RDF::Vocab::BIBO.editor - property :bib_article, predicate: RDF::Vocab::BIBO.Article - end - end -end diff --git a/app/models/concerns/essi/image_metadata.rb b/app/models/concerns/essi/image_metadata.rb deleted file mode 100644 index 4e706b335..000000000 --- a/app/models/concerns/essi/image_metadata.rb +++ /dev/null @@ -1,10 +0,0 @@ -module ESSI - module ImageMetadata - extend ActiveSupport::Concern - - included do - # Add properties that would only be appropriate for use in objects of the Image Work Type - property :digital_specifications, predicate: RDF::Vocab::DC11.format - end - end -end diff --git a/app/models/concerns/essi/paged_resource_metadata.rb b/app/models/concerns/essi/paged_resource_metadata.rb deleted file mode 100644 index ac5b2ba24..000000000 --- a/app/models/concerns/essi/paged_resource_metadata.rb +++ /dev/null @@ -1,11 +0,0 @@ -module ESSI - module PagedResourceMetadata - extend ActiveSupport::Concern - - included do - # Add properties that would only be appropriate for use in objects of the Paged Resource Work Type - property :viewing_hint, predicate: ::RDF::Vocab::IIIF.viewingHint, multiple: false - property :viewing_direction, predicate: ::RDF::Vocab::IIIF.viewingDirection, multiple: false - end - end -end diff --git a/app/models/concerns/essi/scientific_metadata.rb b/app/models/concerns/essi/scientific_metadata.rb deleted file mode 100644 index 92c4024db..000000000 --- a/app/models/concerns/essi/scientific_metadata.rb +++ /dev/null @@ -1,184 +0,0 @@ -module ESSI - module ScientificMetadata - extend ActiveSupport::Concern - - included do - # Add properties that would be appropriate for use in objects of the Scientific Work Type, such as: - # property :digital_specifications, predicate: RDF::Vocab::DC11.format - property :accepted_name_usage, predicate: ::RDF::Vocab::DWC.acceptedNameUsage - property :accepted_name_usage_id, predicate: ::RDF::Vocab::DWC.acceptedNameUsageID - property :according_to, predicate: ::RDF::Vocab::DWC.accordingTo - property :associated_media, predicate: ::RDF::Vocab::DWC.associatedMedia - property :associated_occurrences, predicate: ::RDF::Vocab::DWC.associatedOccurrences - property :associated_organisms, predicate: ::RDF::Vocab::DWC.associatedOrganisms - property :associated_references, predicate: ::RDF::Vocab::DWC.associatedReferences - property :associated_sequences, predicate: ::RDF::Vocab::DWC.associatedSequences - property :associated_taxa, predicate: ::RDF::Vocab::DWC.associatedTaxa - property :basis_of_record, predicate: ::RDF::Vocab::DWC.basisOfRecord - property :bed, predicate: ::RDF::Vocab::DWC.bed - property :behavior, predicate: ::RDF::Vocab::DWC.behavior - property :catalog_number, predicate: ::RDF::Vocab::DWC.catalogNumber - # 'class' is protected - property :dwcclass, predicate: ::RDF::Vocab::DWC.class - property :collection_code, predicate: ::RDF::Vocab::DWC.collectionCode - property :collection_id, predicate: ::RDF::Vocab::DWC.collectionID - property :continent, predicate: ::RDF::Vocab::DWC.continent - property :coordinate_precision, predicate: ::RDF::Vocab::DWC.coordinatePrecision - property :coordinate_uncertainty_in_meters, predicate: ::RDF::Vocab::DWC.coordinateUncertaintyInMeters - property :country, predicate: ::RDF::Vocab::DWC.country - property :country_code, predicate: ::RDF::Vocab::DWC.countryCode - property :county, predicate: ::RDF::Vocab::DWC.county - property :data_generalizations, predicate: ::RDF::Vocab::DWC.dataGeneralizations - property :dataset_id, predicate: ::RDF::Vocab::DWC.datasetID - property :dataset_name, predicate: ::RDF::Vocab::DWC.datasetName - property :date_identified, predicate: ::RDF::Vocab::DWC.dateIdentified - property :day, predicate: ::RDF::Vocab::DWC.day - property :decimal_latitude, predicate: ::RDF::Vocab::DWC.decimalLatitude - property :decimal_longitude, predicate: ::RDF::Vocab::DWC.decimalLongitude - property :disposition, predicate: ::RDF::Vocab::DWC.disposition - property :dynamic_properties, predicate: ::RDF::Vocab::DWC.dynamicProperties - property :earliest_age_or_lowest_stage, predicate: ::RDF::Vocab::DWC.earliestAgeOrLowestStage - property :earliest_eon_or_lowest_eonothem, predicate: ::RDF::Vocab::DWC.earliestEonOrLowestEonothem - property :earliest_epoch_or_lowest_series, predicate: ::RDF::Vocab::DWC.earliestEpochOrLowestSeries - property :earliest_era_or_lowest_erathem, predicate: ::RDF::Vocab::DWC.earliestEraOrLowestErathem - property :earliest_period_or_lowest_system, predicate: ::RDF::Vocab::DWC.earliestPeriodOrLowestSystem - property :end_day_of_year, predicate: ::RDF::Vocab::DWC.endDayOfYear - property :establishment_means, predicate: ::RDF::Vocab::DWC.establishmentMeans - property :event_date, predicate: ::RDF::Vocab::DWC.eventDate - property :event_id, predicate: ::RDF::Vocab::DWC.eventID - property :event_remarks, predicate: ::RDF::Vocab::DWC.eventRemarks - property :event_time, predicate: ::RDF::Vocab::DWC.eventTime - property :family, predicate: ::RDF::Vocab::DWC.family - property :field_notes, predicate: ::RDF::Vocab::DWC.fieldNotes - property :field_number, predicate: ::RDF::Vocab::DWC.fieldNumber - property :footprint_srs, predicate: ::RDF::Vocab::DWC.footprintSRS - property :footprint_spatial_fit, predicate: ::RDF::Vocab::DWC.footprintSpatialFit - property :footprint_wkt, predicate: ::RDF::Vocab::DWC.footprintWKT - property :formation, predicate: ::RDF::Vocab::DWC.formation - property :genus, predicate: ::RDF::Vocab::DWC.genus - property :geodetic_datum, predicate: ::RDF::Vocab::DWC.geodeticDatum - property :geological_context_id, predicate: ::RDF::Vocab::DWC.geologicalContextID - property :georeference_protocol, predicate: ::RDF::Vocab::DWC.georeferenceProtocol - property :georeference_remarks, predicate: ::RDF::Vocab::DWC.georeferenceRemarks - property :georeference_sources, predicate: ::RDF::Vocab::DWC.georeferenceSources - property :georeference_verification_status, predicate: ::RDF::Vocab::DWC.georeferenceVerificationStatus - property :georeferenced_by, predicate: ::RDF::Vocab::DWC.georeferencedBy - property :georeferenced_date, predicate: ::RDF::Vocab::DWC.georeferencedDate - property :group, predicate: ::RDF::Vocab::DWC.group - property :habitat, predicate: ::RDF::Vocab::DWC.habitat - property :higher_classification, predicate: ::RDF::Vocab::DWC.higherClassification - property :higher_geography, predicate: ::RDF::Vocab::DWC.higherGeography - property :higher_geographyID, predicate: ::RDF::Vocab::DWC.higherGeographyID - property :highest_biostratigraphic_zone, predicate: ::RDF::Vocab::DWC.highestBiostratigraphicZone - property :identification_id, predicate: ::RDF::Vocab::DWC.identificationID - property :identification_qualifier, predicate: ::RDF::Vocab::DWC.identificationQualifier - property :identification_references, predicate: ::RDF::Vocab::DWC.identificationReferences - property :identification_remarks, predicate: ::RDF::Vocab::DWC.identificationRemarks - property :identification_verification_status, predicate: ::RDF::Vocab::DWC.identificationVerificationStatus - property :identified_by, predicate: ::RDF::Vocab::DWC.identifiedBy - property :individual_count, predicate: ::RDF::Vocab::DWC.individualCount - property :information_withheld, predicate: ::RDF::Vocab::DWC.informationWithheld - property :infraspecific_epithet, predicate: ::RDF::Vocab::DWC.infraspecificEpithet - property :institution_code, predicate: ::RDF::Vocab::DWC.institutionCode - property :institution_id, predicate: ::RDF::Vocab::DWC.institutionID - property :island, predicate: ::RDF::Vocab::DWC.island - property :island_group, predicate: ::RDF::Vocab::DWC.islandGroup - property :kingdom, predicate: ::RDF::Vocab::DWC.kingdom - property :latest_age_or_highest_stage, predicate: ::RDF::Vocab::DWC.latestAgeOrHighestStage - property :latest_eon_or_highest_eonothem, predicate: ::RDF::Vocab::DWC.latestEonOrHighestEonothem - property :latest_epoch_or_highest_series, predicate: ::RDF::Vocab::DWC.latestEpochOrHighestSeries - property :latest_era_or_highest_erathem, predicate: ::RDF::Vocab::DWC.latestEraOrHighestErathem - property :latest_period_or_highest_system, predicate: ::RDF::Vocab::DWC.latestPeriodOrHighestSystem - property :life_stage, predicate: ::RDF::Vocab::DWC.lifeStage - property :lithostratigraphic_terms, predicate: ::RDF::Vocab::DWC.lithostratigraphicTerms - property :locality, predicate: ::RDF::Vocab::DWC.locality - property :location_according_to, predicate: ::RDF::Vocab::DWC.locationAccordingTo - property :location_id, predicate: ::RDF::Vocab::DWC.locationID - property :location_remarks, predicate: ::RDF::Vocab::DWC.locationRemarks - property :lowest_biostratigraphic_zone, predicate: ::RDF::Vocab::DWC.lowestBiostratigraphicZone - property :material_sample_id, predicate: ::RDF::Vocab::DWC.materialSampleID - property :maximum_depth_in_meters, predicate: ::RDF::Vocab::DWC.maximumDepthInMeters - property :maximum_distance_above_surface_in_meters, predicate: ::RDF::Vocab::DWC.maximumDistanceAboveSurfaceInMeters - property :maximum_elevation_in_meters, predicate: ::RDF::Vocab::DWC.maximumElevationInMeters - property :measurement_accuracy, predicate: ::RDF::Vocab::DWC.measurementAccuracy - property :measurement_determined_by, predicate: ::RDF::Vocab::DWC.measurementDeterminedBy - property :measurement_determined_date, predicate: ::RDF::Vocab::DWC.measurementDeterminedDate - property :measurement_id, predicate: ::RDF::Vocab::DWC.measurementID - property :measurement_method, predicate: ::RDF::Vocab::DWC.measurementMethod - property :measurement_remarks, predicate: ::RDF::Vocab::DWC.measurementRemarks - property :measurement_type, predicate: ::RDF::Vocab::DWC.measurementType - property :measurement_unit, predicate: ::RDF::Vocab::DWC.measurementUnit - property :measurement_value, predicate: ::RDF::Vocab::DWC.measurementValue - property :member, predicate: ::RDF::Vocab::DWC.member - property :minimum_depth_in_meters, predicate: ::RDF::Vocab::DWC.minimumDepthInMeters - property :minimum_distance_above_surface_in_meters, predicate: ::RDF::Vocab::DWC.minimumDistanceAboveSurfaceInMeters - property :minimum_elevation_in_meters, predicate: ::RDF::Vocab::DWC.minimumElevationInMeters - property :month, predicate: ::RDF::Vocab::DWC.month - property :municipality, predicate: ::RDF::Vocab::DWC.municipality - property :name_according_to, predicate: ::RDF::Vocab::DWC.nameAccordingTo - property :name_according_to_id, predicate: ::RDF::Vocab::DWC.nameAccordingToID - property :name_published_in, predicate: ::RDF::Vocab::DWC.namePublishedIn - property :name_published_in_id, predicate: ::RDF::Vocab::DWC.namePublishedInID - property :name_published_in_year, predicate: ::RDF::Vocab::DWC.namePublishedInYear - property :nomenclatural_code, predicate: ::RDF::Vocab::DWC.nomenclaturalCode - property :nomenclatural_status, predicate: ::RDF::Vocab::DWC.nomenclaturalStatus - property :occurrence_id, predicate: ::RDF::Vocab::DWC.occurrenceID - property :occurrence_remarks, predicate: ::RDF::Vocab::DWC.occurrenceRemarks - property :occurrence_status, predicate: ::RDF::Vocab::DWC.occurrenceStatus - property :order, predicate: ::RDF::Vocab::DWC.order - property :organism_id, predicate: ::RDF::Vocab::DWC.organismID - property :organism_name, predicate: ::RDF::Vocab::DWC.organismName - property :organism_remarks, predicate: ::RDF::Vocab::DWC.organismRemarks - property :organism_scope, predicate: ::RDF::Vocab::DWC.organismScope - property :original_name_usage, predicate: ::RDF::Vocab::DWC.originalNameUsage - property :original_name_usage_id, predicate: ::RDF::Vocab::DWC.originalNameUsageID - property :other_catalog_numbers, predicate: ::RDF::Vocab::DWC.otherCatalogNumbers - property :owner_institution_code, predicate: ::RDF::Vocab::DWC.ownerInstitutionCode - property :parent_name_usage, predicate: ::RDF::Vocab::DWC.parentNameUsage - property :parent_name_usage_id, predicate: ::RDF::Vocab::DWC.parentNameUsageID - property :phylum, predicate: ::RDF::Vocab::DWC.phylum - property :point_radius_spatial_fit, predicate: ::RDF::Vocab::DWC.pointRadiusSpatialFit - property :preparations, predicate: ::RDF::Vocab::DWC.preparations - property :previous_identifications, predicate: ::RDF::Vocab::DWC.previousIdentifications - property :record_number, predicate: ::RDF::Vocab::DWC.recordNumber - property :recorded_by, predicate: ::RDF::Vocab::DWC.recordedBy - property :related_resource_id, predicate: ::RDF::Vocab::DWC.relatedResourceID - property :relationship_according_to, predicate: ::RDF::Vocab::DWC.relationshipAccordingTo - property :relationship_established_date, predicate: ::RDF::Vocab::DWC.relationshipEstablishedDate - property :relationship_of_resource, predicate: ::RDF::Vocab::DWC.relationshipOfResource - property :relationship_remarks, predicate: ::RDF::Vocab::DWC.relationshipRemarks - property :reproductive_condition, predicate: ::RDF::Vocab::DWC.reproductiveCondition - property :resource_id, predicate: ::RDF::Vocab::DWC.resourceID - property :resource_relationship_id, predicate: ::RDF::Vocab::DWC.resourceRelationshipID - property :sampling_effort, predicate: ::RDF::Vocab::DWC.samplingEffort - property :sampling_protocol, predicate: ::RDF::Vocab::DWC.samplingProtocol - property :scientific_name, predicate: ::RDF::Vocab::DWC.scientificName - property :scientific_name_authorship, predicate: ::RDF::Vocab::DWC.scientificNameAuthorship - property :scientific_name_id, predicate: ::RDF::Vocab::DWC.scientificNameID - property :sex, predicate: ::RDF::Vocab::DWC.sex - property :specific_epithet, predicate: ::RDF::Vocab::DWC.specificEpithet - property :start_day_of_year, predicate: ::RDF::Vocab::DWC.startDayOfYear - property :state_province, predicate: ::RDF::Vocab::DWC.stateProvince - property :subgenus, predicate: ::RDF::Vocab::DWC.subgenus - property :taxon_concept_id, predicate: ::RDF::Vocab::DWC.taxonConceptID - property :taxon_id, predicate: ::RDF::Vocab::DWC.taxonID - property :taxon_rank, predicate: ::RDF::Vocab::DWC.taxonRank - property :taxon_remarks, predicate: ::RDF::Vocab::DWC.taxonRemarks - property :taxonomic_status, predicate: ::RDF::Vocab::DWC.taxonomicStatus - property :type_status, predicate: ::RDF::Vocab::DWC.typeStatus - property :verbatim_coordinate_system, predicate: ::RDF::Vocab::DWC.verbatimCoordinateSystem - property :verbatim_coordinates, predicate: ::RDF::Vocab::DWC.verbatimCoordinates - property :verbatim_depth, predicate: ::RDF::Vocab::DWC.verbatimDepth - property :verbatim_elevation, predicate: ::RDF::Vocab::DWC.verbatimElevation - property :verbatim_event_date, predicate: ::RDF::Vocab::DWC.verbatimEventDate - property :verbatim_latitude, predicate: ::RDF::Vocab::DWC.verbatimLatitude - property :verbatim_locality, predicate: ::RDF::Vocab::DWC.verbatimLocality - property :verbatim_longitude, predicate: ::RDF::Vocab::DWC.verbatimLongitude - property :verbatim_srs, predicate: ::RDF::Vocab::DWC.verbatimSRS - property :verbatim_taxon_rank, predicate: ::RDF::Vocab::DWC.verbatimTaxonRank - property :vernacular_name, predicate: ::RDF::Vocab::DWC.vernacularName - property :water_body, predicate: ::RDF::Vocab::DWC.waterBody - property :year, predicate: ::RDF::Vocab::DWC.year - end - end -end diff --git a/app/models/image.rb b/app/models/image.rb index 57dcc42ea..a5a54f94e 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -13,9 +13,6 @@ class Image < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # This model includes metadata properties specific to the Image Work Type - # include ESSI::ImageMetadata - # This must be included at the end, because it finalizes the metadata # schema (by adding accepts_nested_attributes) include AllinsonFlex::DynamicMetadataBehavior diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index 499eac700..5245eaa94 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -14,9 +14,6 @@ class PagedResource < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # This model includes metadata properties specific to the PagedResource Work Type - # include ESSI::PagedResourceMetadata - # Include properties for remote metadata lookup include ESSI::RemoteLookupMetadata diff --git a/app/models/scientific.rb b/app/models/scientific.rb index 3a502db73..bafb500d0 100644 --- a/app/models/scientific.rb +++ b/app/models/scientific.rb @@ -13,9 +13,6 @@ class Scientific < ActiveFedora::Base # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } - # This model includes metadata properties specific to the Scientific Work Type - # include ESSI::ScientificMetadata - # This must be included at the end, because it finalizes the metadata # schema (by adding accepts_nested_attributes) diff --git a/lib/generators/hyrax/work/work_generator.rb b/lib/generators/hyrax/work/work_generator.rb index 4a88739ca..c0ce33170 100644 --- a/lib/generators/hyrax/work/work_generator.rb +++ b/lib/generators/hyrax/work/work_generator.rb @@ -197,8 +197,7 @@ def registration_path_symbol end def metadata_mixin - "\n # This model includes metadata properties specific to the #{@archetype_name} Work Type\n" \ - " include ESSI::#{@archetype_name}Metadata\n" + end def controller_mixin From 91c8846c622008d13d2a55cc378a8e24568902f6 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 18 Oct 2024 15:01:49 -0400 Subject: [PATCH 6/6] [ESSI-2022] drop worktype specific behavior modules --- app/models/archival_material.rb | 1 - app/models/bib_record.rb | 1 - app/models/concerns/essi/archival_material_behavior.rb | 6 ------ app/models/concerns/essi/bib_record_behavior.rb | 6 ------ app/models/concerns/essi/image_behavior.rb | 6 ------ app/models/concerns/essi/paged_resource_behavior.rb | 6 ------ app/models/concerns/essi/scientific_behavior.rb | 6 ------ app/models/image.rb | 1 - app/models/paged_resource.rb | 1 - app/models/scientific.rb | 1 - 10 files changed, 35 deletions(-) delete mode 100644 app/models/concerns/essi/archival_material_behavior.rb delete mode 100644 app/models/concerns/essi/bib_record_behavior.rb delete mode 100644 app/models/concerns/essi/image_behavior.rb delete mode 100644 app/models/concerns/essi/paged_resource_behavior.rb delete mode 100644 app/models/concerns/essi/scientific_behavior.rb diff --git a/app/models/archival_material.rb b/app/models/archival_material.rb index 6cff96293..2cc693acb 100644 --- a/app/models/archival_material.rb +++ b/app/models/archival_material.rb @@ -1,7 +1,6 @@ # Generated via # `rails generate hyrax:work ArchivalMaterial` class ArchivalMaterial < ActiveFedora::Base - include ESSI::ArchivalMaterialBehavior include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable diff --git a/app/models/bib_record.rb b/app/models/bib_record.rb index 3e39acb10..5083be6ee 100644 --- a/app/models/bib_record.rb +++ b/app/models/bib_record.rb @@ -1,7 +1,6 @@ # Generated via # `rails generate hyrax:work BibRecord` class BibRecord < ActiveFedora::Base - include ESSI::BibRecordBehavior include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable diff --git a/app/models/concerns/essi/archival_material_behavior.rb b/app/models/concerns/essi/archival_material_behavior.rb deleted file mode 100644 index cb5d2650b..000000000 --- a/app/models/concerns/essi/archival_material_behavior.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ESSI - module ArchivalMaterialBehavior - extend ActiveSupport::Concern - # Add behaviors that make this work type unique - end -end diff --git a/app/models/concerns/essi/bib_record_behavior.rb b/app/models/concerns/essi/bib_record_behavior.rb deleted file mode 100644 index f84db8f44..000000000 --- a/app/models/concerns/essi/bib_record_behavior.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ESSI - module BibRecordBehavior - extend ActiveSupport::Concern - # Add behaviors that make this work type unique - end -end diff --git a/app/models/concerns/essi/image_behavior.rb b/app/models/concerns/essi/image_behavior.rb deleted file mode 100644 index 637017a10..000000000 --- a/app/models/concerns/essi/image_behavior.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ESSI - module ImageBehavior - extend ActiveSupport::Concern - # Add behaviors that make this work type unique - end -end diff --git a/app/models/concerns/essi/paged_resource_behavior.rb b/app/models/concerns/essi/paged_resource_behavior.rb deleted file mode 100644 index ea86fd24b..000000000 --- a/app/models/concerns/essi/paged_resource_behavior.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ESSI - module PagedResourceBehavior - extend ActiveSupport::Concern - # Add behaviors that make this work type unique - end -end diff --git a/app/models/concerns/essi/scientific_behavior.rb b/app/models/concerns/essi/scientific_behavior.rb deleted file mode 100644 index 0d7e9c0fa..000000000 --- a/app/models/concerns/essi/scientific_behavior.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ESSI - module ScientificBehavior - extend ActiveSupport::Concern - # Add behaviors that make this work type unique - end -end diff --git a/app/models/image.rb b/app/models/image.rb index a5a54f94e..f53fe278d 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -1,7 +1,6 @@ # Generated via # `rails generate hyrax:work Image` class Image < ActiveFedora::Base - include ESSI::ImageBehavior include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable diff --git a/app/models/paged_resource.rb b/app/models/paged_resource.rb index 5245eaa94..86825f432 100644 --- a/app/models/paged_resource.rb +++ b/app/models/paged_resource.rb @@ -1,7 +1,6 @@ # Generated via # `rails generate hyrax:work PagedResource` class PagedResource < ActiveFedora::Base - include ESSI::PagedResourceBehavior include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable diff --git a/app/models/scientific.rb b/app/models/scientific.rb index bafb500d0..5355ee8e4 100644 --- a/app/models/scientific.rb +++ b/app/models/scientific.rb @@ -1,7 +1,6 @@ # Generated via # `rails generate hyrax:work Scientific` class Scientific < ActiveFedora::Base - include ESSI::ScientificBehavior include ::Hyrax::WorkBehavior include StructuralMetadata include ExtraLockable