enju_biblio 0.4.0.beta.2 → 0.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1cdac00c9fb0f997f28937e780c89f0ca4d25c7d387afd33744410579f5f6e0
-  data.tar.gz: a5fc966b6ece6ad34d394f60664fa4661a9d9457b61360e5d8c50ad8e36c6d26
+  metadata.gz: 5c83f8e766a5af14cf7076a1c2b1fbe7f1b619f6c8ced04004f3505cae263e8e
+  data.tar.gz: 39c74c2f0a2c87e720b733b33cc94e7b9eae427155b9797331717e4fb5b94520
 SHA512:
-  metadata.gz: e6e3b600fc6d80533135caf4899abd643ff4074bf6721524370c0fccc05f693e5a38d858560cf985f327f1241b428541b4e9eb1d1cf517bf146f4eea3a717e54
-  data.tar.gz: c6e051a2096a87b167c15ba90c596dbccedb4e7d3afb195abfcb85c9a9fd9b989adb4476c0cbdfcffc8db92f844511c319ddecc5f31a777fb43802c8760dab8f
+  metadata.gz: 2efc7c8cf5f2ae73312a9e38a8202de3fd2abbec1edb74d4c773904242e4544507318c38ba5a28c70db954d19897725ecc3ec9476fa30a155e50da6d1f8d9e01
+  data.tar.gz: 316e936de7994a9e873af69ebda3874aab882471be1bc64519bbf135397bc7b0ab8888bf38cf3f5d886ee25406cb65680867226678f81e081f01c7a8ceacca91

data/app/controllers/items_controller.rb

@@ -273,7 +273,11 @@ class ItemsController < ApplicationController
       :lock_version, :manifestation_id, :library_id, :required_role_id,
       :binding_item_identifier, :binding_call_number, :binded_at,
       :use_restriction_id, :memo,
-      item_has_use_restriction_attributes: :use_restriction_id # EnjuCirculation
+      {item_has_use_restriction_attributes: :use_restriction_id}, # EnjuCirculation
+      {custom_properties_attributes: [
+        :id, :label, :value,
+        :_destroy
+      ]}
     )
   end
 

data/app/controllers/manifestations_controller.rb

@@ -429,15 +429,17 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1.json
   def update
     creators_params = manifestation_params[:creators_attributes]
-    Manifestation.transaction do
-      @manifestation.update(manifestation_params.delete_if{|k, v|
-        k == 'creators_attributes'
-      })
-      @manifestation.creators = Agent.new_agents(creators_params)
-    end
+    @manifestation.assign_attributes(manifestation_params.delete_if{|k, v|
+      k == 'creators_attributes'
+    })
 
     respond_to do |format|
       if @manifestation.valid?
+        Manifestation.transaction do
+          @manifestation.creators = Agent.new_agents(creators_params)
+          @manifestation.save!
+        end
+        
         format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
       else
@@ -547,6 +549,10 @@ class ManifestationsController < ApplicationController
       {identifiers_attributes: [
         :id, :body, :identifier_type_id,
         :_destroy
+      ]},
+      {custom_properties_attributes: [
+        :id, :label, :value,
+        :_destroy
       ]}
     )
   end

data/app/mailers/agent_import_mailer.rb

@@ -2,7 +2,7 @@ class AgentImportMailer < ApplicationMailer
   def completed(agent_import_file)
     @agent_import_file = agent_import_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('agent_import_mailer.completed.subject')}: #{@agent_import_file.id}"
     mail(from: from, to: agent_import_file.user.email, subject: subject)
   end
@@ -10,7 +10,7 @@ class AgentImportMailer < ApplicationMailer
   def failed(agent_import_file)
     @agent_import_file = agent_import_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('agent_import_mailer.failed.subject')}: #{@agent_import_file.id}"
     mail(from: from, to: agent_import_file.user.email, subject: subject)
   end

data/app/mailers/resource_export_mailer.rb

@@ -2,7 +2,7 @@ class ResourceExportMailer < ApplicationMailer
   def completed(resource_export_file)
     @resource_export_file = resource_export_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('resource_export_mailer.completed.subject')}: #{@resource_export_file.id}"
     mail(from: from, to: resource_export_file.user.email, subject: subject)
   end
@@ -10,7 +10,7 @@ class ResourceExportMailer < ApplicationMailer
   def failed(resource_export_file)
     @resource_export_file = resource_export_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('resource_export_mailer.failed.subject')}: #{@resource_export_file.id}"
     mail(from: from, to: resource_export_file.user.email, subject: subject)
   end

data/app/mailers/resource_import_mailer.rb

@@ -2,7 +2,7 @@ class ResourceImportMailer < ApplicationMailer
   def completed(resource_import_file)
     @resource_import_file = resource_import_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('resource_import_mailer.completed.subject')}: #{@resource_import_file.id}"
     mail(from: from, to: resource_import_file.user.email, subject: subject)
   end
@@ -10,7 +10,7 @@ class ResourceImportMailer < ApplicationMailer
   def failed(resource_import_file)
     @resource_import_file = resource_import_file
     @library_group = LibraryGroup.site_config
-    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.email}>"
     subject = "#{I18n.t('resource_import_mailer.failed.subject')}: #{@resource_import_file.id}"
     mail(from: from, to: resource_import_file.user.email, subject: subject)
   end

data/app/models/agent.rb

@@ -17,7 +17,7 @@ class Agent < ApplicationRecord
   has_many :derived_agents, through: :children, source: :child
   has_many :original_agents, through: :parents, source: :parent
   has_many :picture_files, as: :picture_attachable, dependent: :destroy
-  has_many :donates
+  has_many :donates, dependent: :destroy
   has_many :donated_items, through: :donates, source: :item
   has_many :owns, dependent: :destroy
   has_many :items, through: :owns
@@ -97,7 +97,7 @@ class Agent < ApplicationRecord
   def set_date_of_birth
     return if birth_date.blank?
     begin
-      date = Time.zone.parse("#{birth_date}")
+      date = Time.zone.parse(birth_date.to_s)
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{birth_date}-01")
@@ -115,7 +115,7 @@ class Agent < ApplicationRecord
   def set_date_of_death
     return if death_date.blank?
     begin
-      date = Time.zone.parse("#{death_date}")
+      date = Time.zone.parse(death_date.to_s)
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{death_date}-01")
@@ -289,7 +289,6 @@ end
 #  full_name_alternative               :text
 #  created_at                          :datetime
 #  updated_at                          :datetime
-#  deleted_at                          :datetime
 #  zip_code_1                          :string
 #  zip_code_2                          :string
 #  address_1                           :text

data/app/models/agent_import_file.rb

@@ -154,7 +154,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.where(id: row['id'].to_s.strip).first
+      agent = Agent.find_by(id: row['id'].to_s.strip)
       if agent
         agent.picture_files.destroy_all
         agent.reload
@@ -173,13 +173,6 @@ class AgentImportFile < ApplicationRecord
   end
 
   private
-  def self.transition_class
-    AgentImportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 
   def open_import_file
     tempfile = Tempfile.new(self.class.name.underscore)

data/app/models/custom_property.rb

@@ -0,0 +1,17 @@
+class CustomProperty < ApplicationRecord
+  belongs_to :resource, polymorphic: true
+  validates :label, presence: true
+end
+
+# == Schema Information
+#
+# Table name: custom_properties
+#
+#  id            :bigint           not null, primary key
+#  resource_id   :integer          not null
+#  resource_type :string           not null
+#  label         :text             not null
+#  value         :text
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#

data/app/models/import_request.rb

@@ -63,15 +63,6 @@ class ImportRequest < ApplicationRecord
       return :error
     end
   end
-
-  private
-  def self.transition_class
-    ImportRequestTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information

data/app/models/isbn_record.rb

@@ -1,4 +1,4 @@
-class IsbnRecord < ActiveRecord::Base
+class IsbnRecord < ApplicationRecord
   has_many :isbn_record_and_manifestations, dependent: :destroy
   has_many :manifestations, through: :isbn_record_and_manifestations
   before_save :normalize_isbn

data/app/models/issn_record.rb

@@ -1,4 +1,4 @@
-class IssnRecord < ActiveRecord::Base
+class IssnRecord < ApplicationRecord
   has_many :issn_record_and_manifestations, dependent: :destroy
   has_many :manifestations, through: :issn_record_and_manifestations
   has_many :issn_record_and_periodicals, dependent: :destroy

data/app/models/item.rb

@@ -10,7 +10,7 @@ class Item < ApplicationRecord
   delegate :display_name, to: :shelf, prefix: true
   has_many :owns
   has_many :agents, through: :owns
-  has_many :donates
+  has_many :donates, dependent: :destroy
   has_many :donors, through: :donates, source: :agent
   has_one :resource_import_result
   belongs_to :manifestation, touch: true
@@ -19,6 +19,8 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
+  has_many :custom_properties, as: :resource, dependent: :destroy
+  accepts_nested_attributes_for :custom_properties, allow_destroy: true, reject_if: :all_blank
   scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
 
   belongs_to :shelf, counter_cache: true
@@ -96,6 +98,52 @@ class Item < ApplicationRecord
       true
     end
   end
+
+  def self.csv_header(role: 'Guest')
+    Item.new.to_hash(role: role).keys
+  end
+
+  def to_hash(role: 'Guest')
+    record = {
+      item_id: id,
+      item_identifier: item_identifier,
+      call_number: call_number,
+      shelf: shelf.name,
+      item_note: note,
+      accepted_at: accept.try(:created_at),
+      acquired_at: acquired_at,
+      item_created_at: created_at,
+      item_updated_at: updated_at
+    }
+
+    if ['Administrator', 'Librarian'].include?(role)
+      record.merge!({
+        bookstore: bookstore.try(:name),
+        budget_type: budget_type.try(:name),
+        item_price: price,
+        memo: memo
+      })
+
+      # 最もカスタム項目の多い資料について、カスタム項目の個数を取得する
+      ActiveRecord::Base.connection.execute('SELECT max(record_count) FROM (SELECT count(*) AS record_count, resource_id, resource_type FROM custom_properties GROUP BY resource_id, resource_type) AS type_count ;').first.values[0].to_i.times do |i|
+        property = custom_properties[i]
+        if property
+          record[:"item_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
+        else
+          record[:"item_custom_property_#{i + 1}"] = nil
+        end
+      end
+
+      if defined?(EnjuCirculation)
+        record.merge!({
+          use_restriction: use_restriction.try(:name),
+          total_checkouts: checkouts.count
+        })
+      end
+    end
+
+    record
+  end
 end
 
 # == Schema Information
@@ -107,7 +155,6 @@ end
 #  item_identifier         :string
 #  created_at              :datetime
 #  updated_at              :datetime
-#  deleted_at              :datetime
 #  shelf_id                :integer          default(1), not null
 #  include_supplements     :boolean          default(FALSE), not null
 #  note                    :text

data/app/models/manifestation.rb

@@ -26,11 +26,13 @@ class Manifestation < ApplicationRecord
   has_one :doi_record
   has_one :periodical_and_manifestation, dependent: :destroy
   has_one :periodical, through: :periodical_and_manifestation
+  has_many :custom_properties, as: :resource, dependent: :destroy
   accepts_nested_attributes_for :creators, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :contributors, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :publishers, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :series_statements, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :identifiers, allow_destroy: true, reject_if: :all_blank
+  accepts_nested_attributes_for :custom_properties, allow_destroy: true, reject_if: :all_blank
 
   searchable do
     text :title, default_boost: 2 do
@@ -109,7 +111,6 @@ class Manifestation < ApplicationRecord
     end
     time :created_at
     time :updated_at
-    time :deleted_at
     time :pub_date, multiple: true do
       if series_master?
         root_series_statement.root_manifestation.pub_dates
@@ -529,266 +530,128 @@ class Manifestation < ApplicationRecord
     end
   end
 
-  def self.csv_header(role, options = {col_sep: "\t", role: :Guest})
-    header = %w(
-      manifestation_id
-      original_title
-      title_transcription
-      creator
-      contributor
-      publisher
-      pub_date
-      statement_of_responsibility
-      manifestation_price
-      manifestation_created_at
-      manifestation_updated_at
-      manifestation_identifier
-      access_address
-      description
-      note
-      extent
-      dimensions
-      carrier_type
-      edition
-      edition_string
-      volume_number
-      volume_number_string
-      issue_number
-      issue_number_string
-      serial_number
+  # CSVのヘッダ
+  # @param [String] role 権限
+  def self.csv_header(role: 'Guest')
+    Manifestation.new.to_hash(role: role).keys
+  end
+
+  # CSV出力用のハッシュ
+  # @param [String] role 権限
+  def to_hash(role: 'Guest')
+    record = {
+      manifestation_id: id,
+      title: original_title,
+      title_alternative: title_alternative,
+      title_transcription: title_transcription,
+      statement_of_responsibility: statement_of_responsibility,
+      serial: serial,
+      manifestation_identifier: manifestation_identifier,
+      creator: creators.pluck(:full_name).join('//'),
+      contributor: contributors.pluck(:full_name).join('//'),
+      publisher: publishers.pluck(:full_name).join('//'),
+      date_of_publication: date_of_publication,
+      year_of_publication: year_of_publication,
+      publication_place: publication_place,
+      manifestation_created_at: created_at,
+      manifestation_updated_at: updated_at,
+      carrier_type: carrier_type.name,
+      content_type: manifestation_content_type.name,
+      frequency: frequency.name,
+      language: language.name,
+      isbn: identifier_contents(:isbn).join('//'),
+      issn: identifier_contents(:issn).join('//'),
+      volume_number: volume_number,
+      volume_number_string: volume_number_string,
+      edition: edition,
+      edition_string: edition_string,
+      issue_number: issue_number,
+      issue_number_string: issue_number_string,
+      serial_number: serial_number,
+      extent: extent,
+      start_page: start_page,
+      end_page: end_page,
+      dimensions: dimensions,
+      height: height,
+      width: width,
+      depth: depth,
+      price: price,
+      access_address: access_address,
+      required_role: required_role.name,
+      description: description,
+      note: note
+    }
+
+    IdentifierType.find_each do |type|
+      record[type.name.to_sym] = identifiers.where(identifier_type: type).pluck(:body).join('//')
+    end
+
+    series = series_statements.order(:position)
+    record.merge!(
+      series_statement_id: series.pluck(:id).join('//'),
+      series_statement_original_title: series.pluck(:original_title).join('.//'),
+      series_statement_title_subseries: series.pluck(:title_subseries).join('//'),
+      series_statement_title_subseries_transcription: series.pluck(:title_subseries_transcription).join('//'),
+      series_statement_title_transcription: series.pluck(:title_transcription).join('//'),
+      series_statement_creator: series.pluck(:creator_string).join('//'),
+      series_statement_volume_number: series.pluck(:volume_number_string).join('//'),
+      series_statement_series_master: series.pluck(:series_master).join('//'),
+      series_statement_root_manifestation_id: series.pluck(:root_manifestation_id).join('//'),
+      series_statement_manifestation_id: series.pluck(:manifestation_id).join('//'),
+      series_statement_position: series.pluck(:position).join('//'),
+      series_statement_note: series.pluck(:note).join('//'),
+      series_statement_created_at: series.pluck(:created_at).join('//'),
+      series_statement_updated_at: series.pluck(:updated_at).join('//')
     )
 
-    header += IdentifierType.order(:position).pluck(:name)
-    if defined?(EnjuSubject)
-      header += SubjectHeadingType.order(:position).pluck(:name).map{|type| "subject:#{type}"}
-      header += ClassificationType.order(:position).pluck(:name).map{|type| "classification:#{type}"}
-    end
+    if ['Administrator', 'Librarian'].include?(role)
+      record.merge!({
+        memo: memo
+      })
 
-    header += %w(
-      item_id
-      item_identifier
-      call_number
-      item_note
-    )
-    case role.to_sym
-    when :Administrator, :Librarian
-      header << "item_price"
+      # 最もカスタム項目の多い資料について、カスタム項目の個数を取得する
+      ActiveRecord::Base.connection.execute('SELECT max(record_count) FROM (SELECT count(*) AS record_count, resource_id, resource_type FROM custom_properties GROUP BY resource_id, resource_type) AS type_count ;').first.values[0].to_i.times do |i|
+        property = custom_properties[i]
+        if property
+          record[:"manifestation_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
+        else
+          record[:"manifestation_custom_property_#{i + 1}"] = nil
+        end
+      end
     end
-    header += %w(
-      acquired_at
-      accepted_at
-    )
-    case role.to_sym
-    when :Administrator, :Librarian
-      header += %w(
-        bookstore
-        budget_type
-        total_checkouts
-      )
-    end
-    header += %w(
-      circulation_status
-      shelf
-      library
-      item_created_at
-      item_updated_at
-    )
-    case role.to_sym
-    when :Administrator, :Librarian
-      header << "use_restriction"
+
+    if defined?(EnjuSubject)
+      SubjectHeadingType.find_each do |type|
+        record[:"subject:#{type.name}"] = subjects.where(subject_heading_type: type).pluck(:term).join('//')
+      end
+      ClassificationType.find_each do |type|
+        record[:"classification:#{type.name}"] = classifications.where(classification_type: type).pluck(:category).join('//')
+      end
     end
 
-    header.to_csv(options)
+    record
   end
 
-  def to_csv(options = {format: :txt, role: :Guest})
-    lines = []
-    if items.exists?
-      items.includes(shelf: :library).each do |i|
-        item_lines = []
-        item_lines << id
-        item_lines << original_title
-        item_lines << title_transcription
-        if creators.exists?
-          item_lines << creators.pluck(:full_name).join("//")
-        else
-          item_lines << nil
-        end
-        if contributors.exists?
-          item_lines << contributors.pluck(:full_name).join("//")
-        else
-          item_lines << nil
-        end
-        if publishers.exists?
-          item_lines << publishers.pluck(:full_name).join("//")
-        else
-          item_lines << nil
-        end
-        item_lines << pub_date
-        item_lines << statement_of_responsibility
-        item_lines << price
-        item_lines << created_at
-        item_lines << updated_at
-        item_lines << manifestation_identifier
-        item_lines << access_address
-        item_lines << description.try(:gsub, /\r?\n/, '\n')
-        item_lines << note.try(:gsub, /\r?\n/, '\n')
-        item_lines << extent
-        item_lines << dimensions
-        item_lines << carrier_type.name
-        item_lines << edition
-        item_lines << edition_string
-        item_lines << volume_number
-        item_lines << volume_number_string
-        item_lines << issue_number
-        item_lines << issue_number_string
-        item_lines << serial_number
-
-        IdentifierType.order(:position).pluck(:name).each do |identifier_type|
-          identifier_list = identifier_contents(identifier_type.to_sym)
-          if identifier_list
-            item_lines << identifier_list.join("//")
-          else
-            item_lines << nil
+  # TSVでのエクスポート
+  # @param [String] role 権限
+  # @param [String] col_sep 区切り文字
+  def self.export(role: 'Guest', col_sep: "\t")
+    file = Tempfile.create('manifestation_export') do |f|
+      f.write (Manifestation.csv_header(role: role) + Item.csv_header(role: role)).to_csv(col_sep: col_sep)
+      Manifestation.find_each do |manifestation|
+        if manifestation.items.exists?
+          manifestation.items.each do |item|
+            f.write (manifestation.to_hash(role: role).values + item.to_hash(role: role).values).to_csv(col_sep: col_sep)
           end
-        end
-        if defined?(EnjuSubject)
-          SubjectHeadingType.order(:position).each do |subject_heading_type|
-            if subjects.exists?
-              item_lines << subjects.where(subject_heading_type: subject_heading_type).pluck(:term).join('//')
-            else
-              item_lines << nil
-            end
-          end
-          ClassificationType.order(:position).each do |classification_type|
-            if classifications.exists?
-              item_lines << classifications.where(classification_type: classification_type).pluck(:category).join('//')
-            else
-              item_lines << nil
-            end
-          end
-        end
-
-        item_lines << i.id
-        item_lines << i.item_identifier
-        item_lines << i.call_number
-        item_lines << i.note.try(:gsub, /\r?\n/, '\n')
-        case options[:role].to_sym
-        when :Administrator, :Librarian
-          item_lines << i.price
-        end
-        item_lines << i.acquired_at
-        item_lines << i.accept.try(:created_at)
-        case options[:role].to_sym
-        when :Administrator, :Librarian
-          item_lines << i.bookstore.try(:name)
-          item_lines << i.budget_type.try(:name)
-          if defined?(EnjuCirculation)
-            item_lines << Checkout.where(item_id: i.id).count
-          else
-            item_lines << ''
-          end
-        end
-        if defined?(EnjuCirculation)
-          item_lines << i.circulation_status.try(:name)
-        else
-          item_lines << ''
-        end
-        item_lines << i.shelf.name
-        item_lines << i.shelf.library.name
-        item_lines << i.created_at
-        item_lines << i.updated_at
-        case options[:role].to_sym
-        when :Administrator, :Librarian
-          if defined?(EnjuCirculation)
-            item_lines << i.use_restriction.try(:name)
-          else
-            item_lines << ''
-          end
-        end
-        lines << item_lines
-      end
-    else
-      line = []
-      line << id
-      line << original_title
-      line << title_transcription
-      if creators.exists?
-        line << creators.pluck(:full_name).join("//")
-      else
-        line << nil
-      end
-      if contributors.exists?
-        line << contributors.pluck(:full_name).join("//")
-      else
-        line << nil
-      end
-      if publishers.exists?
-        line << publishers.pluck(:full_name).join("//")
-      else
-        line << nil
-      end
-      line << pub_date
-      line << statement_of_responsibility
-      line << price
-      line << created_at
-      line << updated_at
-      line << manifestation_identifier
-      line << access_address
-      line << description.try(:gsub, /\r?\n/, '\n')
-      line << note.try(:gsub, /\r?\n/, '\n')
-      line << extent
-      line << dimensions
-      line << carrier_type.name
-      line << edition
-      line << edition_string
-      line << volume_number
-      line << volume_number_string
-      line << issue_number
-      line << issue_number_string
-      line << serial_number
-
-      IdentifierType.order(:position).pluck(:name).each do |identifier_type|
-        identifier_list = identifier_contents(identifier_type.to_sym)
-        if identifier_list
-          line << identifier_list.join("//")
         else
-          line << nil
-        end
-      end
-      if defined?(EnjuSubject)
-        SubjectHeadingType.order(:position).each do |subject_heading_type|
-          if subjects.exists?
-            line << subjects.where(subject_heading_type: subject_heading_type).pluck(:term).join('//')
-          else
-            line << nil
-          end
-        end
-        ClassificationType.order(:position).each do |classification_type|
-          if classifications.exists?
-            line << classifications.where(classification_type: classification_type).pluck(:category).join('//')
-          else
-            line << nil
-          end
+          f.write manifestation.to_hash(role: role).values.to_csv(col_sep: col_sep)
         end
       end
 
-      lines << line
-    end
-
-    if options[:format] == :txt
-      lines.map{|i| i.to_csv(col_sep: "\t")}.join
-    else
-      lines
+      f.rewind
+      f.read
     end
-  end
 
-  def self.export(options = {format: :txt, role: :Guest})
-    file = ''
-    file += Manifestation.csv_header(options[:role], col_sep: "\t") if options[:format].to_sym == :txt
-    Manifestation.find_each do |manifestation|
-      file += manifestation.to_csv(options)
-    end
     file
   end
 
@@ -824,7 +687,6 @@ end
 #  date_copyrighted                :datetime
 #  created_at                      :datetime
 #  updated_at                      :datetime
-#  deleted_at                      :datetime
 #  access_address                  :string
 #  language_id                     :integer          default(1), not null
 #  carrier_type_id                 :integer          default(1), not null