enju_biblio 0.3.8 → 0.3.10

data/app/models/item_custom_property.rb

@@ -0,0 +1,18 @@
+class ItemCustomProperty < ApplicationRecord
+  include MasterModel
+  validates :name, presence: true, uniqueness: true
+  acts_as_list
+end
+
+# == Schema Information
+#
+# Table name: item_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/app/models/item_custom_value.rb

@@ -0,0 +1,17 @@
+class ItemCustomValue < ApplicationRecord
+  belongs_to :item_custom_property
+  belongs_to :item, required: false
+  validates :item_custom_property, uniqueness: {scope: :item_id}
+end
+
+# == Schema Information
+#
+# Table name: item_custom_values
+#
+#  id                      :integer          not null, primary key
+#  item_custom_property_id :integer          not null
+#  item_id                 :integer          not null
+#  value                   :text
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#

data/app/models/license.rb

@@ -1,6 +1,5 @@
 class License < ApplicationRecord
   include MasterModel
-  default_scope { order('licenses.position') }
 end
 
 # == Schema Information

data/app/models/manifestation.rb

@@ -25,13 +25,13 @@ class Manifestation < ApplicationRecord
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
   has_one :resource_import_result
   has_many :identifiers, dependent: :destroy
-  has_many :custom_properties, as: :resource, dependent: :destroy
+  has_many :manifestation_custom_values, -> { joins(:manifestation_custom_property).order(:position) }
   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
+  accepts_nested_attributes_for :manifestation_custom_values, reject_if: :all_blank
 
   searchable do
     text :title, default_boost: 2 do
@@ -96,7 +96,7 @@ class Manifestation < ApplicationRecord
       end
     end
     string :language do
-      language.try(:name)
+      language&.name
     end
     string :item_identifier, multiple: true do
       if series_master?
@@ -120,7 +120,7 @@ class Manifestation < ApplicationRecord
     end
     time :date_of_publication
     integer :pub_year do
-      date_of_publication.try(:year)
+      date_of_publication&.year
     end
     integer :creator_ids, multiple: true
     integer :contributor_ids, multiple: true
@@ -357,7 +357,7 @@ class Manifestation < ApplicationRecord
   # TODO: よりよい推薦方法
   def self.pickup(keyword = nil, current_user = nil)
     return nil if self.cached_numdocs < 5
-    if current_user.try(:role)
+    if current_user&.role
       current_role_id = current_user.role.id
     else
       current_role_id = 1
@@ -433,7 +433,7 @@ class Manifestation < ApplicationRecord
   end
 
   def index_series_statement
-    series_statements.map{|s| s.index; s.root_manifestation.try(:index)}
+    series_statements.map{|s| s.index; s.root_manifestation&.index}
   end
 
   def acquired_at
@@ -541,16 +541,34 @@ class Manifestation < ApplicationRecord
   def to_hash(role: 'Guest')
     record = {
       manifestation_id: id,
-      title: original_title,
+      original_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,
+      creator: creates.map{|create|
+        if create.create_type
+          "#{create.agent.full_name}||#{create.create_type.name}"
+        else
+          "#{create.agent.full_name}"
+        end
+      }.join('//'),
+      contributor: realizes.map{|realize|
+        if realize.realize_type
+          "#{realize.agent.full_name}||#{realize.realize_type.name}"
+        else
+          "#{realize.agent.full_name}"
+        end
+      }.join('//'),
+      publisher: produces.map{|produce|
+        if produce.produce_type
+          "#{produce.agent.full_name}||#{produce.produce_type.name}"
+        else
+          "#{produce.agent.full_name}"
+        end
+      }.join('//'),
+      pub_date: date_of_publication,
       year_of_publication: year_of_publication,
       publication_place: publication_place,
       manifestation_created_at: created_at,
@@ -577,13 +595,13 @@ class Manifestation < ApplicationRecord
       depth: depth,
       price: price,
       access_address: access_address,
-      required_role: required_role.name,
+      manifestation_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('//')
+      record[:"identifier:#{type.name.to_sym}"] = identifiers.where(identifier_type: type).pluck(:body).join('//')
     end
 
     series = series_statements.order(:position)
@@ -608,15 +626,9 @@ class Manifestation < ApplicationRecord
       record.merge!({
         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[:"manifestation_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
-        else
-          record[:"manifestation_custom_property_#{i + 1}"] = nil
-        end
+      ManifestationCustomProperty.order(:position).each do |custom_property|
+        custom_value = manifestation_custom_values.find_by(manifestation_custom_property: custom_property)
+        record[:"manifestation:#{custom_property.name}"] = custom_value&.value
       end
     end
 
@@ -629,6 +641,14 @@ class Manifestation < ApplicationRecord
       end
     end
 
+    if defined?(EnjuNdl)
+      record["jpno"] = identifier_contents(:jpno).first
+    end
+
+    if defined?(EnjuNii)
+      record["ncid"] = identifier_contents(:ncid).first
+    end
+
     record
   end
 
@@ -671,6 +691,18 @@ class Manifestation < ApplicationRecord
       ]
     }.flatten
   end
+
+  def set_custom_property(row)
+    ManifestationCustomProperty.all.each do |property|
+      if row[property]
+        custom_value = ManifestationCustomValue.new(
+          manifestation: self,
+          manifestation_custom_property: property,
+          value: row[property]
+        )
+      end
+    end
+  end
 end
 
 # == Schema Information

data/app/models/manifestation_custom_property.rb

@@ -0,0 +1,18 @@
+class ManifestationCustomProperty < ApplicationRecord
+  include MasterModel
+  validates :name, presence: true, uniqueness: true
+  acts_as_list
+end
+
+# == Schema Information
+#
+# Table name: manifestation_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/app/models/manifestation_custom_value.rb

@@ -0,0 +1,17 @@
+class ManifestationCustomValue < ApplicationRecord
+  belongs_to :manifestation_custom_property
+  belongs_to :manifestation, required: false
+  validates :manifestation_custom_property, uniqueness: {scope: :manifestation_id}
+end
+
+# == Schema Information
+#
+# Table name: manifestation_custom_values
+#
+#  id                               :integer          not null, primary key
+#  manifestation_custom_property_id :integer          not null
+#  manifestation_id                 :integer          not null
+#  value                            :text
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
+#

data/app/models/medium_of_performance.rb

@@ -1,7 +1,6 @@
 class MediumOfPerformance < ApplicationRecord
   include MasterModel
-  default_scope { order('medium_of_performances.position') }
-  has_many :works
+  has_many :works, class_name: 'Manifestation'
 end
 
 # == Schema Information

data/app/models/picture_file.rb

@@ -45,9 +45,7 @@ end
 #  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string
-#  content_type            :string
 #  title                   :text
-#  thumbnail               :string
 #  position                :integer
 #  created_at              :datetime
 #  updated_at              :datetime

data/app/models/resource_export_file.rb

@@ -31,8 +31,10 @@ class ResourceExportFile < ApplicationRecord
     transition_to!(:started)
     role_name = user.try(:role).try(:name)
     tsv = Manifestation.export(role: role_name)
-    self.resource_export = StringIO.new(tsv)
-    self.resource_export.instance_write(:filename, "resource_export.txt")
+    file = StringIO.new(tsv)
+    file.class.class_eval { attr_accessor :original_filename, :content_type }
+    file.original_filename =  'resource_export.txt'
+    self.resource_export = file
     save!
     transition_to!(:completed)
     mailer = ResourceExportMailer.completed(self)

data/app/models/resource_import_file.rb

@@ -76,12 +76,13 @@ class ResourceImportFile < ApplicationRecord
     #end
     row_num = 1
 
-    ResourceImportResult.create!(resource_import_file_id: id, body: rows.headers.join("\t"))
+    ResourceImportResult.create!(resource_import_file_id: id, body: (%w( imported_manifestation_id imported_item_id ) + rows.headers).join("\t"))
     rows.each do |row|
       row_num += 1
-      import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
+      import_result = ResourceImportResult.new(resource_import_file_id: id)
       if row['dummy'].to_s.strip.present?
         import_result.error_message = "line #{row_num}: #{I18n.t('import.dummy')}"
+        import_result.body = ([nil, nil] + row.fields).join("\t")
         import_result.save!
         next
       end
@@ -92,6 +93,7 @@ class ResourceImportFile < ApplicationRecord
         import_result.item = item
         import_result.manifestation = item.manifestation
         import_result.error_message = "line #{row_num}: #{I18n.t('import.item_found')}"
+        import_result.body = ([item.manifestation.id, item.id] + row.fields).join("\t")
         import_result.save!
         num[:item_found] += 1
         next
@@ -187,8 +189,13 @@ class ResourceImportFile < ApplicationRecord
       import_result.manifestation = manifestation
 
       if manifestation
+        ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
+          value.update!(manifestation: manifestation)
+        end
+
+        item = nil
         if item_identifier.present? || row['shelf'].present? || row['call_number'].present?
-          import_result.item = create_item(row, manifestation)
+          item = create_item(row, manifestation)
         else
           if manifestation.fulltext_content?
             item = create_item(row, manifestation)
@@ -200,17 +207,21 @@ class ResourceImportFile < ApplicationRecord
           end
           num[:failed] += 1
         end
+
+        if item
+          ResourceImportFile.import_item_custom_value(row, item).each do |value|
+            value.update!(item: item)
+          end
+
+          import_result.item = item
+        end
       else
         num[:failed] += 1
       end
 
+      import_result.body = ([manifestation.try(:id), item.try(:id)] + row.fields).join("\t")
       import_result.save!
-      num[:item_imported] +=1 if import_result.item
-
-      if row_num % 50 == 0
-        Sunspot.commit
-        GC.start
-      end
+      num[:item_imported] += 1 if import_result.item
     end
 
     Sunspot.commit
@@ -311,56 +322,24 @@ class ResourceImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier) if item_identifier.present?
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         if item.manifestation
           fetch(row, edit_mode: 'update')
+          item = update_item(item, row)
         end
 
-        if defined?(EnjuCirculation)
-          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
-          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+        ResourceImportFile.import_item_custom_value(row, item).each do |value|
+          value.update!(item: item)
         end
-
-        shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
-        bookstore = Bookstore.find_by(name: row['bookstore'])
-        required_role = Role.find_by(name: row['required_role'])
-
-        item.shelf = shelf if shelf
-        item.circulation_status = circulation_status if circulation_status
-        item.checkout_type = checkout_type if checkout_type
-        item.bookstore = bookstore if bookstore
-        item.required_role = required_role if required_role
-        item.use_restriction = use_restriction if use_restriction
-
-        acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
-        binded_at = Time.zone.parse(row['binded_at']) rescue nil
-        item.acquired_at = acquired_at if acquired_at
-        item.binded_at = binded_at if binded_at
-
-        item_columns = %w(
-          call_number
-          binding_item_identifier binding_call_number binded_at
-        )
-        item_columns.each do |column|
-          if row[column].present?
-            item.assign_attributes(:"#{column}" => row[column])
-          end
+        ResourceImportFile.import_manifestation_custom_value(row, item.manifestation).each do |value|
+          value.update!(manifestation: item.manifestation)
         end
 
-        item.price = row['item_price'] if row['item_price'].present?
-        item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
-        item.url = row['item_url'] if row['item_url'].present?
-
-        if row['include_supplements']
-          if %w(t true).include?(row['include_supplements'].downcase.strip)
-            item.include_supplements = true
-          else
-            item.include_supplements = false if item.include_supplements
-          end
-        end
         item.manifestation.reload
         item.save!
         import_result.item = item
@@ -372,6 +351,9 @@ class ResourceImportFile < ApplicationRecord
         end
         if manifestation
           fetch(row, edit_mode: 'update')
+          ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
+            value.update!(manifestation: manifestation)
+          end
           import_result.manifestation = manifestation
         end
       end
@@ -397,8 +379,11 @@ class ResourceImportFile < ApplicationRecord
 
     rows.each do |row|
       row_num += 1
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         item.destroy if item.removable?
       end
@@ -422,10 +407,9 @@ class ResourceImportFile < ApplicationRecord
     row_num = 1
 
     rows.each do |row|
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
       unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip)
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
@@ -482,6 +466,9 @@ class ResourceImportFile < ApplicationRecord
       use_restriction include_supplements item_note item_url
       dummy
     )
+    header_columns += ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}
+    header_columns += ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}
+
     if defined?(EnjuSubject)
       header_columns += ClassificationType.order(:position).pluck(:name).map{|c| "classification:#{c}"}
       header_columns += SubjectHeadingType.order(:position).pluck(:name).map{|s| "subject:#{s}"}
@@ -578,12 +565,68 @@ class ResourceImportFile < ApplicationRecord
     item
   end
 
+  def update_item(item, row)
+    shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
+    bookstore = Bookstore.find_by(name: row['bookstore'])
+    required_role = Role.find_by(name: row['required_role'])
+
+    item.shelf = shelf if shelf
+    item.bookstore = bookstore if bookstore
+    item.required_role = required_role if required_role
+
+    acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
+    binded_at = Time.zone.parse(row['binded_at']) rescue nil
+    item.acquired_at = acquired_at if acquired_at
+    item.binded_at = binded_at if binded_at
+
+    if defined?(EnjuCirculation)
+      circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+      checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+      use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+      item.circulation_status = circulation_status if circulation_status
+      item.checkout_type = checkout_type if checkout_type
+      item.use_restriction = use_restriction if use_restriction
+    end
+
+    item_columns = %w(
+      call_number
+      binding_item_identifier binding_call_number binded_at
+    )
+    item_columns.each do |column|
+      if row[column].present?
+        item.assign_attributes(:"#{column}" => row[column])
+      end
+    end
+
+    item.price = row['item_price'] if row['item_price'].present?
+    item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
+    item.url = row['item_url'] if row['item_url'].present?
+
+    if row['include_supplements']
+      if %w(t true).include?(row['include_supplements'].downcase.strip)
+        item.include_supplements = true
+      else
+        item.include_supplements = false if item.include_supplements
+      end
+    end
+
+    item
+  end
+
   def fetch(row, options = {edit_mode: 'create'})
-    case options[:edit_mode]
-    when 'create'
-      manifestation = nil
-    when 'update'
-      manifestation = Item.find_by(item_identifier: row['item_identifier'].to_s.strip).try(:manifestation)
+    manifestation = nil
+    item = nil
+
+    if options[:edit_mode] == 'update'
+      if row['item_identifier'].to_s.strip.present?
+        item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip)
+      end
+      if row['item_id'].to_s.strip.present?
+        item = Item.find_by(id: row['item_id'].to_s.strip)
+      end
+
+      manifestation = item.manifestation if item
+
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier
@@ -608,13 +651,13 @@ class ResourceImportFile < ApplicationRecord
     end
 
     # TODO: 小数点以下の表現
-    language = Language.where(name: row['language'].to_s.strip.camelize).first
-    language = Language.where(iso_639_2: row['language'].to_s.strip.downcase).first unless language
-    language = Language.where(iso_639_1: row['language'].to_s.strip.downcase).first unless language
+    language = Language.find_by(name: row['language'].to_s.strip.camelize)
+    language = Language.find_by(iso_639_2: row['language'].to_s.strip.downcase) unless language
+    language = Language.find_by(iso_639_1: row['language'].to_s.strip.downcase) unless language
     
-    carrier_type = CarrierType.where(name: row['carrier_type'].to_s.strip).first
-    content_type = ContentType.where(name: row['content_type'].to_s.strip).first
-    frequency = Frequency.where(name: row['frequency'].to_s.strip).first
+    carrier_type = CarrierType.find_by(name: row['carrier_type'].to_s.strip)
+    content_type = ContentType.find_by(name: row['content_type'].to_s.strip)
+    frequency = Frequency.find_by(name: row['frequency'].to_s.strip)
 
     fulltext_content = serial = nil
     if %w(t true).include?(row['fulltext_content'].to_s.downcase.strip)
@@ -764,6 +807,7 @@ class ResourceImportFile < ApplicationRecord
         manifestation.set_agent_role_type(publishers_list, scope: :publisher)
       end
     end
+
     manifestation
   end
 
@@ -790,6 +834,52 @@ class ResourceImportFile < ApplicationRecord
     end
     identifiers
   end
+
+  def self.import_manifestation_custom_value(row, manifestation)
+    values = []
+    ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}.each do |column_name|
+      value = nil
+      property = column_name.split(':').last
+      next if row[column_name].blank?
+      if manifestation
+        value = manifestation.manifestation_custom_values.find_by(manifestation_custom_property: property)
+      end
+
+      if value
+        value.value = row[column_name]
+      else
+        value = ManifestationCustomValue.new(
+          manifestation_custom_property: ManifestationCustomProperty.find_by(name: property),
+          value: row[column_name]
+        )
+      end
+      values << value
+    end
+    values
+  end
+
+  def self.import_item_custom_value(row, item)
+    values = []
+    ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}.each do |column_name|
+      value = nil
+      property = column_name.split(':').last
+      next if row[column_name].blank?
+      if item
+        value = item.item_custom_values.find_by(item_custom_property: property)
+      end
+
+      if value
+        value.value = row[column_name]
+      else
+        value = ItemCustomValue.new(
+          item_custom_property: ItemCustomProperty.find_by(name: property),
+          value: row[column_name]
+        )
+      end
+      values << value
+    end
+    values
+  end
 end
 
 # == Schema Information