diff --git a/app/services/collections_report.rb b/app/services/collections_report.rb index ffeac3f7..e75c81c3 100644 --- a/app/services/collections_report.rb +++ b/app/services/collections_report.rb @@ -8,6 +8,8 @@ def self.fields(collection = Collection.new) [ { id: collection.id }, { title: collection.title }, + { description: collection.description }, + { creator: collection.creator }, { depositor: collection.depositor }, { edit_users: collection.edit_users.join(" ") }, { works: collection_members(collection).join(" ") } diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb index fb95fa2c..345da71c 100644 --- a/config/initializers/bulkrax.rb +++ b/config/initializers/bulkrax.rb @@ -36,58 +36,58 @@ config.field_mappings = { "Bulkrax::CsvParser" => { - "advisor" => { from: ["advisor"], parsed: true, split: '\|' }, - "alternate_title" => { from: ["alternate_title"], parsed: true, split: '\|' }, - "college" => { from: ["college"] }, - "committee_member" => { from: ["committee_member"], parsed: true, split: '\|' }, + "title" => { from: ["title"], parsed: true, split: '\|' }, "creator" => { from: ["creator"], split: '\|' }, - "date_created" => { from: ["date_created"] }, - "degree" => { from: ["degree"] }, + "college" => { from: ["college"] }, "department" => { from: ["department"] }, "description" => { from: ["description"] }, - "doi" => { from: ["doi"] }, - "etd_publisher" => { from: ["etd_publisher"] }, - "genre" => { from: ["genre"] }, - "issn" => { from: ["issn"], split: '\|' }, - "journal_title" => { from: ["journal_title"], split: '\|' }, - "language" => { from: ["language"], split: '\|' }, "license" => { from: ["license"], split: '\|', parsed: true }, - "note" => { from: ["note"] }, "publisher" => { from: ["publisher"] }, - "related_url" => { from: ["related_url"], split: '\|' }, - "required_software" => { from: ["required_software"] }, + "date_created" => { from: ["date_created"] }, + "alternate_title" => { from: ["alternate_title"], parsed: true, split: '\|' }, "subject" => { from: ["subject"], split: '\|' }, "geo_subject" => { from: ["geo_subject"], split: '\|' }, "time_period" => { from: ["time_period"], split: '\|' }, - "title" => { from: ["title"], parsed: true, split: '\|' } + "language" => { from: ["language"], split: '\|' }, + "required_software" => { from: ["required_software"] }, + "note" => { from: ["note"] }, + "related_url" => { from: ["related_url"], split: '\|' }, + "advisor" => { from: ["advisor"], parsed: true, split: '\|' }, + "committee_member" => { from: ["committee_member"], parsed: true, split: '\|' }, + "degree" => { from: ["degree"] }, + "doi" => { from: ["doi"] }, + "etd_publisher" => { from: ["etd_publisher"] }, + "genre" => { from: ["genre"] }, + "issn" => { from: ["issn"], split: '\|' }, + "journal_title" => { from: ["journal_title"], split: '\|' } } } config.field_mappings['Bulkrax::BagitParser'] = { - "advisor" => { from: ["advisor"], parsed: true, split: '\|' }, - "alternate_title" => { from: ["alternate_title"], parsed: true, split: '\|' }, - "college" => { from: ["college"] }, - "committee_member" => { from: ["committee_member"], parsed: true, split: '\|' }, + "title" => { from: ["title"], parsed: true, split: '\|' }, "creator" => { from: ["creator"], split: '\|' }, - "date_created" => { from: ["date_created"] }, - "degree" => { from: ["degree"] }, + "college" => { from: ["college"] }, "department" => { from: ["department"] }, "description" => { from: ["description"] }, - "doi" => { from: ["doi"] }, - "etd_publisher" => { from: ["etd_publisher"] }, - "genre" => { from: ["genre"] }, - "issn" => { from: ["issn"], split: '\|' }, - "journal_title" => { from: ["journal_title"], split: '\|' }, - "language" => { from: ["language"], split: '\|' }, "license" => { from: ["license"], split: '\|', parsed: true }, - "note" => { from: ["note"] }, "publisher" => { from: ["publisher"] }, - "related_url" => { from: ["related_url"], split: '\|' }, - "required_software" => { from: ["required_software"] }, + "date_created" => { from: ["date_created"] }, + "alternate_title" => { from: ["alternate_title"], parsed: true, split: '\|' }, "subject" => { from: ["subject"], split: '\|' }, "geo_subject" => { from: ["geo_subject"], split: '\|' }, "time_period" => { from: ["time_period"], split: '\|' }, - "title" => { from: ["title"], parsed: true, split: '\|' } + "language" => { from: ["language"], split: '\|' }, + "required_software" => { from: ["required_software"] }, + "note" => { from: ["note"] }, + "related_url" => { from: ["related_url"], split: '\|' }, + "advisor" => { from: ["advisor"], parsed: true, split: '\|' }, + "committee_member" => { from: ["committee_member"], parsed: true, split: '\|' }, + "degree" => { from: ["degree"] }, + "doi" => { from: ["doi"] }, + "etd_publisher" => { from: ["etd_publisher"] }, + "genre" => { from: ["genre"] }, + "issn" => { from: ["issn"], split: '\|' }, + "journal_title" => { from: ["journal_title"], split: '\|' } } # Add to, or change existing mappings as follows diff --git a/spec/services/collections_report_spec.rb b/spec/services/collections_report_spec.rb index 6a68cb63..80ed5a2c 100644 --- a/spec/services/collections_report_spec.rb +++ b/spec/services/collections_report_spec.rb @@ -10,10 +10,10 @@ describe '#create_report' do let(:fake_collections) { [ - FakeCollection.new('pid', 'title', 'foo@bar.org', ['foo@bar.org'], ['pid', 'pid']), - FakeCollection.new('pid', 'title', 'foo@bar.org', ['foo@bar.org'], ['pid']), - FakeCollection.new('pid', 'title', 'foo@bar.org', ['foo@bar.org'], ['']), - FakeCollection.new('pid', 'title', 'foo@bar.org', ['foo@bar.org'], ['pid', 'pid']) + FakeCollection.new('pid', 'title', 'test description','Test, User', 'foo@bar.org', ['foo@bar.org'], ['pid', 'pid']), + FakeCollection.new('pid', 'title', 'test description','Test, User','foo@bar.org', ['foo@bar.org'], ['pid']), + FakeCollection.new('pid', 'title', 'test description','Test, User','foo@bar.org', ['foo@bar.org'], ['']), + FakeCollection.new('pid', 'title', 'test description','Test, User','foo@bar.org', ['foo@bar.org'], ['pid', 'pid']) ] } before do @@ -34,7 +34,7 @@ ).to eq(fake_collections.length + 1) end - class FakeCollection < Struct.new(:id, :title, :depositor, :edit_users, :member_ids) + class FakeCollection < Struct.new(:id, :title, :description, :creator, :depositor, :edit_users, :member_ids) end end -end \ No newline at end of file +end