enju_biblio 0.2.5 → 0.3.0.beta.2

data/app/controllers/produces_controller.rb

@@ -82,7 +82,7 @@ class ProducesController < ApplicationController
     end
 
     respond_to do |format|
-      if @produce.update_attributes(produce_params)
+      if @produce.update(produce_params)
         format.html { redirect_to @produce, notice: t('controller.successfully_updated', model: t('activerecord.models.produce')) }
         format.json { head :no_content }
       else

data/app/controllers/realize_types_controller.rb

@@ -62,7 +62,7 @@ class RealizeTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @realize_type.update_attributes(realize_type_params)
+      if @realize_type.update(realize_type_params)
         format.html { redirect_to @realize_type, notice: t('controller.successfully_updated', model: t('activerecord.models.realize_type')) }
         format.json { head :no_content }
       else

data/app/controllers/realizes_controller.rb

@@ -78,7 +78,7 @@ class RealizesController < ApplicationController
     end
 
     respond_to do |format|
-      if @realize.update_attributes(realize_params)
+      if @realize.update(realize_params)
         format.html { redirect_to @realize, notice: t('controller.successfully_updated', model: t('activerecord.models.realize')) }
         format.json { head :no_content }
       else

data/app/controllers/resource_export_files_controller.rb

@@ -76,7 +76,7 @@ class ResourceExportFilesController < ApplicationController
   # PUT /resource_export_files/1.json
   def update
     respond_to do |format|
-      if @resource_export_file.update_attributes(resource_export_file_params)
+      if @resource_export_file.update(resource_export_file_params)
         if @resource_export_file.mode == 'export'
           ResourceExportFileJob.perform_later(@resource_export_file)
         end

data/app/controllers/resource_import_files_controller.rb

@@ -78,7 +78,7 @@ class ResourceImportFilesController < ApplicationController
   # PUT /resource_import_files/1.json
   def update
     respond_to do |format|
-      if @resource_import_file.update_attributes(resource_import_file_params)
+      if @resource_import_file.update(resource_import_file_params)
         if @resource_import_file.mode == 'import'
           ResourceImportFileJob.perform_later(@resource_import_file)
         end

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -58,7 +58,7 @@ class SeriesStatementMergeListsController < ApplicationController
   # PUT /series_statement_merge_lists/1.json
   def update
     respond_to do |format|
-      if @series_statement_merge_list.update_attributes(series_statement_merge_list_params)
+      if @series_statement_merge_list.update(series_statement_merge_list_params)
         if params[:mode] == 'merge'
           selected_series_statement = SeriesStatement.find(params[:selected_series_statement_id]) rescue nil
           if selected_series_statement

data/app/controllers/series_statement_merges_controller.rb

@@ -67,7 +67,7 @@ class SeriesStatementMergesController < ApplicationController
   # PUT /series_statement_merges/1.json
   def update
     respond_to do |format|
-      if @series_statement_merge.update_attributes(series_statement_merge_params)
+      if @series_statement_merge.update(series_statement_merge_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.series_statement_merge'))
         format.html { redirect_to(@series_statement_merge) }
         format.json { head :no_content }

data/app/controllers/series_statements_controller.rb

@@ -11,7 +11,7 @@ class SeriesStatementsController < ApplicationController
     query = params[:query].to_s.strip
     page = params[:page] || 1
 
-    unless query.blank?
+    if query.present?
       @query = query.dup
       query = query.gsub('　', ' ')
     end
@@ -92,7 +92,7 @@ class SeriesStatementsController < ApplicationController
     end
 
     respond_to do |format|
-      if @series_statement.update_attributes(series_statement_params)
+      if @series_statement.update(series_statement_params)
         format.html { redirect_to @series_statement, notice: t('controller.successfully_updated', model: t('activerecord.models.series_statement')) }
         format.json { head :no_content }
       else

data/{lib/enju_biblio/biblio_helper.rb → app/helpers/enju_biblio/application_helper.rb}

@@ -1,5 +1,5 @@
 module EnjuBiblio
-  module BiblioHelper
+  module ApplicationHelper
     def form_icon(carrier_type)
       image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
     rescue NoMethodError

data/app/models/agent.rb

@@ -24,11 +24,11 @@ class Agent < ActiveRecord::Base
   has_many :agent_merges, dependent: :destroy
   has_many :agent_merge_lists, through: :agent_merges
   belongs_to :agent_type
-  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
   belongs_to :language
   belongs_to :country
   has_one :agent_import_result
-  belongs_to :profile
+  belongs_to :profile, optional: true
 
   validates_presence_of :language, :agent_type, :country
   validates_associated :language, :agent_type, :country

data/app/models/agent_import_file.rb

@@ -27,10 +27,10 @@ class AgentImportFile < ActiveRecord::Base
     'application/vnd.ms-excel'
   ]
   validates_attachment_presence :agent_import
-  belongs_to :user, validate: true
-  has_many :agent_import_results
+  belongs_to :user
+  has_many :agent_import_results, dependent: :destroy
 
-  has_many :agent_import_file_transitions, autosave: false
+  has_many :agent_import_file_transitions, autosave: false, dependent: :destroy
 
   attr_accessor :mode
 

data/app/models/agent_import_result.rb

@@ -4,7 +4,7 @@ class AgentImportResult < ActiveRecord::Base
   scope :failed, -> { where(agent_id: nil) }
 
   belongs_to :agent_import_file
-  belongs_to :agent
+  belongs_to :agent, optional: true
 
   validates_presence_of :agent_import_file_id
 end

data/app/models/agent_merge.rb

@@ -1,6 +1,6 @@
 class AgentMerge < ActiveRecord::Base
-  belongs_to :agent, validate: true
-  belongs_to :agent_merge_list, validate: true
+  belongs_to :agent
+  belongs_to :agent_merge_list
   validates_presence_of :agent, :agent_merge_list
   validates_associated :agent, :agent_merge_list
 

data/app/models/agent_relationship.rb

@@ -1,7 +1,7 @@
 class AgentRelationship < ActiveRecord::Base
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Agent'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Agent'
-  belongs_to :agent_relationship_type
+  belongs_to :agent_relationship_type, optional: true
   validate :check_parent
   validates_presence_of :parent_id, :child_id
   acts_as_list scope: :parent_id

data/app/models/create.rb

@@ -1,7 +1,7 @@
 class Create < ActiveRecord::Base
   belongs_to :agent
   belongs_to :work, class_name: 'Manifestation', foreign_key: 'work_id', touch: true
-  belongs_to :create_type
+  belongs_to :create_type, optional: true
 
   validates_associated :agent, :work
   validates_presence_of :agent_id, :work_id

data/app/models/identifier.rb

@@ -1,7 +1,6 @@
 class Identifier < ActiveRecord::Base
-  #attr_accessible :body, :identifier_type_id, :manifestation_id, :primary, :position
   belongs_to :identifier_type
-  belongs_to :manifestation, touch: true
+  belongs_to :manifestation, touch: true, optional: true
 
   validates_presence_of :body
   validates_uniqueness_of :body, scope: [:identifier_type_id, :manifestation_id]

data/app/models/import_request.rb

@@ -1,7 +1,7 @@
 class ImportRequest < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   default_scope { order('import_requests.id DESC') }
-  belongs_to :manifestation
+  belongs_to :manifestation, optional: true
   belongs_to :user
   validates_presence_of :isbn
   validate :check_isbn

data/app/models/item.rb

@@ -13,9 +13,9 @@ class Item < ActiveRecord::Base
   has_many :donors, through: :donates, source: :agent
   has_one :resource_import_result
   belongs_to :manifestation, touch: true
-  belongs_to :bookstore, validate: true
-  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
-  belongs_to :budget_type
+  belongs_to :bookstore, optional: true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
+  belongs_to :budget_type, optional: true
 
   validates_associated :bookstore
   validates :manifestation_id, presence: true

data/app/models/manifestation.rb

@@ -22,7 +22,7 @@ class Manifestation < ActiveRecord::Base
   belongs_to :manifestation_content_type, class_name: 'ContentType', foreign_key: 'content_type_id'
   has_many :series_statements
   belongs_to :frequency
-  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
   has_one :resource_import_result
   has_many :identifiers, dependent: :destroy
   accepts_nested_attributes_for :creators, allow_destroy: true, reject_if: :all_blank
@@ -393,15 +393,15 @@ class Manifestation < ActiveRecord::Base
   end
 
   def created(agent)
-    creates.where(agent_id: agent.id).first
+    creates.find_by(agent_id: agent.id)
   end
 
   def realized(agent)
-    realizes.where(agent_id: agent.id).first
+    realizes.find_by(agent_id: agent.id)
   end
 
   def produced(agent)
-    produces.where(agent_id: agent.id).first
+    produces.find_by(agent_id: agent.id)
   end
 
   def sort_title
@@ -421,9 +421,9 @@ class Manifestation < ActiveRecord::Base
   end
 
   def self.find_by_isbn(isbn)
-    identifier_type = IdentifierType.where(name: 'isbn').first
+    identifier_type = IdentifierType.find_by(name: 'isbn')
     return nil unless identifier_type
-    Manifestation.includes(identifiers: :identifier_type).where(:"identifiers.body" => isbn, :"identifier_types.name" => 'isbn')
+    Manifestation.includes(identifiers: :identifier_type).where("identifiers.body": isbn, "identifier_types.name": 'isbn')
   end
 
   def index_series_statement
@@ -440,33 +440,33 @@ class Manifestation < ActiveRecord::Base
   end
 
   def web_item
-    items.where(shelf_id: Shelf.web.id).first
+    items.find_by(shelf_id: Shelf.web.id)
   end
 
   def set_agent_role_type(agent_lists, options = {scope: :creator})
     agent_lists.each do |agent_list|
       name_and_role = agent_list[:full_name].split('||')
       if agent_list[:agent_identifier].present?
-        agent = Agent.where(agent_identifier: agent_list[:agent_identifier]).first
+        agent = Agent.find_by(agent_identifier: agent_list[:agent_identifier])
       end
-      agent = Agent.where(full_name: name_and_role[0]).first unless agent
+      agent = Agent.find_by(full_name: name_and_role[0]) unless agent
       next unless agent
       type = name_and_role[1].to_s.strip
 
       case options[:scope]
       when :creator
         type = 'author' if type.blank?
-        role_type = CreateType.where(name: type).first
-        create = Create.where(work_id: id, agent_id: agent.id).first
+        role_type = CreateType.find_by(name: type)
+        create = Create.find_by(work_id: id, agent_id: agent.id)
         if create
           create.create_type = role_type
           create.save(validate: false)
         end
       when :publisher
         type = 'publisher' if role_type.blank?
-        produce = Produce.where(manifestation_id: id, agent_id: agent.id).first
+        produce = Produce.find_by(manifestation_id: id, agent_id: agent.id)
         if produce
-          produce.produce_type = ProduceType.where(name: type).first
+          produce.produce_type = ProduceType.find_by(name: type)
           produce.save(validate: false)
         end
       else
@@ -515,7 +515,7 @@ class Manifestation < ActiveRecord::Base
     if Rails::VERSION::MAJOR > 3
       identifiers.id_type(name).order(:position).pluck(:body)
     else
-      identifier_type = IdentifierType.where(name: name).first
+      identifier_type = IdentifierType.find_by(name: name)
       if identifier_type
         identifiers.where(identifier_type_id: identifier_type.id).order(:position).pluck(:body)
       else
@@ -583,6 +583,7 @@ class Manifestation < ActiveRecord::Base
     end
     header += %w(
       circulation_status
+      use_restriction
       shelf
       library
       item_created_at
@@ -636,8 +637,9 @@ class Manifestation < ActiveRecord::Base
         item_lines << serial_number
 
         IdentifierType.order(:position).pluck(:name).each do |identifier_type|
-          if identifier_contents(identifier_type.to_sym).first
-            item_lines << identifier_contents(identifier_type.to_sym).first
+          identifier_list = identifier_contents(identifier_type.to_sym)
+          if identifier_list
+            item_lines << identifier_list.join("//")
           else
             item_lines << nil
           end
@@ -673,9 +675,10 @@ class Manifestation < ActiveRecord::Base
         when :Administrator, :Librarian
           item_lines << i.bookstore.try(:name)
           item_lines << i.budget_type.try(:name)
-          item_lines << Checkout.where(:item_id => i.id).size
+          item_lines << Checkout.where(item_id: i.id).size
         end
         item_lines << i.circulation_status.try(:name)
+        item_lines << i.use_restriction.try(:name)
         item_lines << i.shelf.name
         item_lines << i.shelf.library.name
         item_lines << i.created_at
@@ -723,8 +726,9 @@ class Manifestation < ActiveRecord::Base
       line << serial_number
 
       IdentifierType.order(:position).pluck(:name).each do |identifier_type|
-        if identifier_contents(identifier_type.to_sym).first
-          line << identifier_contents(identifier_type.to_sym).first
+        identifier_list = identifier_contents(identifier_type.to_sym)
+        if identifier_list
+          line << identifier_list.join("//")
         else
           line << nil
         end
@@ -766,7 +770,7 @@ class Manifestation < ActiveRecord::Base
   end
 
   def root_series_statement
-    series_statements.where(root_manifestation_id: id).first
+    series_statements.find_by(root_manifestation_id: id)
   end
 
   def isbn_characters

data/app/models/manifestation_relationship.rb

@@ -1,7 +1,7 @@
 class ManifestationRelationship < ActiveRecord::Base
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Manifestation'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Manifestation'
-  belongs_to :manifestation_relationship_type
+  belongs_to :manifestation_relationship_type, optional: true
   validate :check_parent
   validates_presence_of :parent_id, :child_id
   acts_as_list scope: :parent_id

data/app/models/picture_file.rb

@@ -1,6 +1,6 @@
 class PictureFile < ActiveRecord::Base
   scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
-  belongs_to :picture_attachable, polymorphic: true, validate: true
+  belongs_to :picture_attachable, polymorphic: true
   before_save :extract_dimensions
 
   if ENV['ENJU_STORAGE'] == 's3'

data/app/models/produce.rb

@@ -1,7 +1,7 @@
 class Produce < ActiveRecord::Base
   belongs_to :agent
   belongs_to :manifestation, touch: true
-  belongs_to :produce_type
+  belongs_to :produce_type, optional: true
   delegate :original_title, to: :manifestation, prefix: true
 
   validates_associated :agent, :manifestation

data/app/models/realize.rb

@@ -1,7 +1,7 @@
 class Realize < ActiveRecord::Base
   belongs_to :agent
   belongs_to :expression, class_name: 'Manifestation', foreign_key: 'expression_id', touch: true
-  belongs_to :realize_type
+  belongs_to :realize_type, optional: true
 
   validates_associated :agent, :expression
   validates_presence_of :agent, :expression

data/app/models/resource_export_file.rb

@@ -18,7 +18,7 @@ class ResourceExportFile < ActiveRecord::Base
   end
   validates_attachment_content_type :resource_export, content_type: /\Atext\/plain\Z/
 
-  has_many :resource_export_file_transitions, autosave: false
+  has_many :resource_export_file_transitions, autosave: false, dependent: :destroy
 
   def state_machine
     ResourceExportFileStateMachine.new(self, transition_class: ResourceExportFileTransition)

data/app/models/resource_import_file.rb

@@ -29,10 +29,10 @@ class ResourceImportFile < ActiveRecord::Base
   validates_attachment_presence :resource_import
   validates :resource_import, presence: true, on: :create
   validates :default_shelf_id, presence: true, if: Proc.new{|model| model.edit_mode == 'create'}
-  belongs_to :user, validate: true
-  belongs_to :default_shelf, class_name: 'Shelf'
-  has_many :resource_import_results
-  has_many :resource_import_file_transitions, autosave: false
+  belongs_to :user
+  belongs_to :default_shelf, class_name: 'Shelf', optional: true
+  has_many :resource_import_results, dependent: :destroy
+  has_many :resource_import_file_transitions, autosave: false, dependent: :destroy
 
   attr_accessor :mode, :library_id
 
@@ -87,7 +87,7 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(item_identifier: item_identifier).first
+      item = Item.find_by(item_identifier: item_identifier)
       if item
         import_result.item = item
         import_result.manifestation = item.manifestation
@@ -98,39 +98,39 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       if row['manifestation_identifier'].present?
-        manifestation = Manifestation.where(manifestation_identifier: row['manifestation_identifier'].to_s.strip).first
+        manifestation = Manifestation.find_by(manifestation_identifier: row['manifestation_identifier'].to_s.strip)
       end
 
       unless manifestation
         if row['manifestation_id'].present?
-          manifestation = Manifestation.where(id: row['manifestation_id'].to_s.strip).first
+          manifestation = Manifestation.find_by(id: row['manifestation_id'].to_s.strip)
         end
       end
 
       unless manifestation
         if row['doi'].present?
           doi = URI.parse(row['doi']).path.gsub(/^\//, "")
-          identifier_type_doi = IdentifierType.where(name: 'doi').first
-          identifier_type_doi = IdentifierType.where(name: 'doi').create! unless identifier_type_doi
-          manifestation = Identifier.where(body: doi, identifier_type_id: identifier_type_doi.id).first.try(:manifestation)
+          identifier_type_doi = IdentifierType.find_by(name: 'doi')
+          identifier_type_doi = IdentifierType.create!(name: 'doi') unless identifier_type_doi
+          manifestation = Identifier.find_by(body: doi, identifier_type_id: identifier_type_doi.id).try(:manifestation)
         end
       end
 
       unless manifestation
         if row['jpno'].present?
           jpno = row['jpno'].to_s.strip
-          identifier_type_jpno = IdentifierType.where(name: 'jpno').first
-          identifier_type_jpno = IdentifierType.where(name: 'jpno').create! unless identifier_type_jpno
-          manifestation = Identifier.where(body: jpno, identifier_type_id: identifier_type_jpno.id).first.try(:manifestation)
+          identifier_type_jpno = IdentifierType.find_by(name: 'jpno')
+          identifier_type_jpno = IdentifierType.create!(name: 'jpno') unless identifier_type_jpno
+          manifestation = Identifier.find_by(body: jpno, identifier_type_id: identifier_type_jpno.id).try(:manifestation)
         end
       end
 
       unless manifestation
         if row['ncid'].present?
           ncid = row['ncid'].to_s.strip
-          identifier_type_ncid = IdentifierType.where(name: 'ncid').first
+          identifier_type_ncid = IdentifierType.find_by(name: 'ncid')
           identifier_type_ncid = IdentifierType.where(name: 'ncid').create! unless identifier_type_ncid
-          manifestation = Identifier.where(body: ncid, identifier_type_id: identifier_type_ncid.id).first.try(:manifestation)
+          manifestation = Identifier.find_by(body: ncid, identifier_type_id: identifier_type_ncid.id).try(:manifestation)
         end
       end
 
@@ -138,9 +138,9 @@ class ResourceImportFile < ActiveRecord::Base
         if row['isbn'].present?
           if StdNum::ISBN.valid?(row['isbn'])
             isbn = StdNum::ISBN.normalize(row['isbn'])
-            identifier_type_isbn = IdentifierType.where(name: 'isbn').first
+            identifier_type_isbn = IdentifierType.find_by(name: 'isbn')
             identifier_type_isbn = IdentifierType.where(name: 'isbn').create! unless identifier_type_isbn
-            m = Identifier.where(body: isbn, identifier_type_id: identifier_type_isbn.id).first.try(:manifestation)
+            m = Identifier.find_by(body: isbn, identifier_type_id: identifier_type_isbn.id).try(:manifestation)
             if m
               if m.series_statements.exists?
                 manifestation = m
@@ -172,6 +172,12 @@ class ResourceImportFile < ActiveRecord::Base
             import_result.error_message = "line #{row_num}: #{I18n.t('import.isbn_record_not_found')}"
           end
         end
+        if manifestation.nil? and row['ndl_bib_id']
+          manifestation = Manifestation.import_ndl_bib_id(row['ndl_bib_id'])
+          if manifestation
+            num[:manifestation_imported] += 1
+          end
+        end
       end
 
       unless manifestation
@@ -181,12 +187,12 @@ class ResourceImportFile < ActiveRecord::Base
       import_result.manifestation = manifestation
 
       if manifestation
-        if item_identifier.present? or row['shelf'].present? or row['call_number'].present?
+        if item_identifier.present? || row['shelf'].present? || row['call_number'].present?
           import_result.item = create_item(row, manifestation)
         else
           if manifestation.fulltext_content?
             item = create_item(row, manifestation)
-            item.circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
+            item.circulation_status = CirculationStatus.find_by(name: 'Available On Shelf')
             begin
               item.acquired_at = Time.zone.parse(row['acquired_at'].to_s.strip)
             rescue ArgumentError
@@ -238,7 +244,7 @@ class ResourceImportFile < ActiveRecord::Base
     manifestation = expression
     manifestation.during_import = true
     manifestation.reload
-    manifestation.update_attributes!(options)
+    manifestation.update!(options)
     manifestation.publishers = agents.uniq unless agents.empty?
     manifestation.reload
     manifestation
@@ -269,7 +275,7 @@ class ResourceImportFile < ActiveRecord::Base
       manifestation.save
 
       full_name = record['700']['a']
-      publisher = Agent.where(full_name: record['700']['a']).first
+      publisher = Agent.find_by(full_name: record['700']['a'])
       unless publisher
         publisher = Agent.new(full_name: full_name)
         publisher.save
@@ -303,17 +309,17 @@ class ResourceImportFile < ActiveRecord::Base
       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.where(item_identifier: item_identifier).first if item_identifier.present?
+      item = Item.find_by(item_identifier: item_identifier) if item_identifier.present?
       if item
         if item.manifestation
           fetch(row, edit_mode: 'update')
         end
-        shelf = Shelf.where(name: row['shelf'].to_s.strip).first
-        circulation_status = CirculationStatus.where(name: row['circulation_status']).first
-        checkout_type = CheckoutType.where(name: row['checkout_type']).first
-        bookstore = Bookstore.where(name: row['bookstore']).first
-        required_role = Role.where(name: row['required_role']).first
-        use_restriction = UseRestriction.where(name: row['use_restriction'].to_s.strip).first
+        shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
+        circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+        checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+        bookstore = Bookstore.find_by(name: row['bookstore'])
+        required_role = Role.find_by(name: row['required_role'])
+        use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
 
         item.shelf = shelf if shelf
         item.circulation_status = circulation_status if circulation_status
@@ -348,13 +354,14 @@ class ResourceImportFile < ActiveRecord::Base
             item.include_supplements = false if item.include_supplements
           end
         end
+        item.manifestation.reload
         item.save!
         import_result.item = item
       else
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
-        manifestation = Manifestation.where(manifestation_identifier: manifestation_identifier).first if manifestation_identifier.present?
+        manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier.present?
         unless manifestation
-          manifestation = Manifestation.where(id: row['manifestation_id']).first
+          manifestation = Manifestation.find_by(id: row['manifestation_id'])
         end
         if manifestation
           fetch(row, edit_mode: 'update')
@@ -380,7 +387,7 @@ class ResourceImportFile < ActiveRecord::Base
     rows.each do |row|
       row_num += 1
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(item_identifier: item_identifier).first
+      item = Item.find_by(item_identifier: item_identifier)
       if item
         item.destroy if item.removable?
       end
@@ -401,15 +408,15 @@ class ResourceImportFile < ActiveRecord::Base
 
     rows.each do |row|
       item_identifier = row['item_identifier'].to_s.strip
-      item = Item.where(item_identifier: item_identifier).first
+      item = Item.find_by(item_identifier: item_identifier)
       unless item
-        item = Item.where(id: row['item_id'].to_s.strip).first
+        item = Item.find_by(id: row['item_id'].to_s.strip)
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
-      manifestation = Manifestation.where(manifestation_identifier: manifestation_identifier).first
+      manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier)
       unless manifestation
-        manifestation = Manifestation.where(id: row['manifestation_id'].to_s.strip).first
+        manifestation = Manifestation.find_by(id: row['manifestation_id'].to_s.strip)
       end
 
       if item && manifestation
@@ -445,6 +452,7 @@ class ResourceImportFile < ActiveRecord::Base
       language fulltext_content required_role doi content_type frequency
       extent start_page end_page dimensions
       ncid
+      ndl_bib_id
       statement_of_responsibility acquired_at call_number circulation_status
       binding_item_identifier binding_call_number binded_at item_price
       use_restriction include_supplements item_note item_url
@@ -473,12 +481,12 @@ class ResourceImportFile < ActiveRecord::Base
       type = column_name.split(':').last
       subject_list = row[column_name].to_s.split('//')
       subject_list.map{|value|
-        subject_heading_type = SubjectHeadingType.where(name: type).first
+        subject_heading_type = SubjectHeadingType.find_by(name: type)
         next unless subject_heading_type
         subject = Subject.new(term: value)
         subject.subject_heading_type = subject_heading_type
         # TODO: Subject typeの設定
-        subject.subject_type = SubjectType.where(name: 'concept').first
+        subject.subject_type = SubjectType.find_by(name: 'concept')
         subject.save!
         subjects << subject
       }
@@ -492,7 +500,7 @@ class ResourceImportFile < ActiveRecord::Base
       type = column_name.split(':').last
       classification_list = row[column_name].to_s.split('//')
       classification_list.map{|value|
-        classification_type = ClassificationType.where(name: type).first
+        classification_type = ClassificationType.find_by(name: type)
         next unless classification_type
         classification = Classification.new(category: value)
         classification.classification_type = classification_type
@@ -504,12 +512,12 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   def create_item(row, manifestation)
-    shelf = Shelf.where(name: row['shelf'].to_s.strip).first
+    shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
     unless shelf
       shelf = default_shelf || Shelf.web
     end
-    bookstore = Bookstore.where(name: row['bookstore'].to_s.strip).first
-    budget_type = BudgetType.where(name: row['budget_type'].to_s.strip).first
+    bookstore = Bookstore.find_by(name: row['bookstore'].to_s.strip)
+    budget_type = BudgetType.find_by(name: row['budget_type'].to_s.strip)
     acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
     binded_at = Time.zone.parse(row['binded_at']) rescue nil
     item = Item.new(
@@ -526,11 +534,11 @@ class ResourceImportFile < ActiveRecord::Base
     )
     manifestation.items << item
     if defined?(EnjuCirculation)
-      circulation_status = CirculationStatus.where(name: row['circulation_status'].to_s.strip).first || CirculationStatus.where(name: 'In Process').first
+      circulation_status = CirculationStatus.find_by(name: row['circulation_status'].to_s.strip) || CirculationStatus.find_by(name: 'In Process')
       item.circulation_status = circulation_status
-      use_restriction = UseRestriction.where(name: row['use_restriction'].to_s.strip).first
+      use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
       unless use_restriction
-        use_restriction = UseRestriction.where(name: 'Not For Loan').first
+        use_restriction = UseRestriction.find_by(name: 'Not For Loan')
       end
       item.use_restriction = use_restriction
     end
@@ -551,11 +559,11 @@ class ResourceImportFile < ActiveRecord::Base
     when 'create'
       manifestation = nil
     when 'update'
-      manifestation = Item.where(item_identifier: row['item_identifier'].to_s.strip).first.try(:manifestation)
+      manifestation = Item.find_by(item_identifier: row['item_identifier'].to_s.strip).try(:manifestation)
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
-        manifestation = Manifestation.where(manifestation_identifier: manifestation_identifier).first if manifestation_identifier
-        manifestation = Manifestation.where(id: row['manifestation_id']).first unless manifestation
+        manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier
+        manifestation = Manifestation.find_by(id: row['manifestation_id']) unless manifestation
       end
     end
 
@@ -625,33 +633,33 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       attributes = {
-        :original_title => title[:original_title],
-        :title_transcription => title[:title_transcription],
-        :title_alternative => title[:title_alternative],
-        :title_alternative_transcription => title[:title_alternative_transcription],
-        :pub_date => row['pub_date'],
-        :volume_number => row['volume_number'],
-        :volume_number_string => row['volume_number_string'],
-        :issue_number => row['issue_number'],
-        :issue_number_string => row['issue_number_string'],
-        :serial_number => row['serial_number'],
-        :edition => row['edition'],
-        :edition_string => row['edition_string'],
-        :width => row['width'],
-        :depth => row['depth'],
-        :height => row['height'],
-        :price => row['manifestation_price'],
-        :description => row['description'].try(:gsub, /\\n/, "\n"),
+        original_title: title[:original_title],
+        title_transcription: title[:title_transcription],
+        title_alternative: title[:title_alternative],
+        title_alternative_transcription: title[:title_alternative_transcription],
+        pub_date: row['pub_date'],
+        volume_number: row['volume_number'],
+        volume_number_string: row['volume_number_string'],
+        issue_number: row['issue_number'],
+        issue_number_string: row['issue_number_string'],
+        serial_number: row['serial_number'],
+        edition: row['edition'],
+        edition_string: row['edition_string'],
+        width: row['width'],
+        depth: row['depth'],
+        height: row['height'],
+        price: row['manifestation_price'],
+        description: row['description'].try(:gsub, /\\n/, "\n"),
         #:description_transcription => row['description_transcription'],
-        :note => row['note'].try(:gsub, /\\n/, "\n"),
-        :statement_of_responsibility => row['statement_of_responsibility'],
-        :access_address => row['access_address'],
-        :manifestation_identifier => row['manifestation_identifier'],
-        :publication_place => row['publication_place'],
-        :extent => row['extent'],
-        :dimensions => row['dimensions'],
-        :start_page => row['start_page'],
-        :end_page => row['end_page'],
+        note: row['note'].try(:gsub, /\\n/, "\n"),
+        statement_of_responsibility: row['statement_of_responsibility'],
+        access_address: row['access_address'],
+        manifestation_identifier: row['manifestation_identifier'],
+        publication_place: row['publication_place'],
+        extent: row['extent'],
+        dimensions: row['dimensions'],
+        start_page: row['start_page'],
+        end_page: row['end_page'],
       }.delete_if{|_key, value| value.nil?}
 
       manifestation = self.class.import_manifestation(expression, publisher_agents, attributes,
@@ -659,17 +667,17 @@ class ResourceImportFile < ActiveRecord::Base
         edit_mode: options[:edit_mode]
       })
 
-      required_role = Role.where(name: row['required_role_name'].to_s.strip.camelize).first
+      required_role = Role.find_by(name: row['required_role_name'].to_s.strip.camelize)
       if required_role && row['required_role_name'].present?
         manifestation.required_role = required_role
       else
-        manifestation.required_role = Role.where(name: 'Guest').first unless manifestation.required_role
+        manifestation.required_role = Role.find_by(name: 'Guest') unless manifestation.required_role
       end
 
       if language && row['language'].present?
         manifestation.language = language
       else
-        manifestation.language = Language.where(name: 'unknown').first unless manifestation.language
+        manifestation.language = Language.find_by(name: 'unknown') unless manifestation.language
       end
 
       manifestation.carrier_type = carrier_type if carrier_type
@@ -687,12 +695,12 @@ class ResourceImportFile < ActiveRecord::Base
           end
           if row['series_original_title']
             series_statement = SeriesStatement.new(
-              :original_title => row['series_original_title'],
-              :title_transcription => row['series_title_transcription'],
-              :title_subseries => row['series_title_subseries'],
-              :title_subseries_transcription => row['series_title_subseries_transcription'],
-              :volume_number_string => row['series_volume_number_string'],
-              :creator_string => row['series_creator_string'],
+              original_title: row['series_original_title'],
+              title_transcription: row['series_title_transcription'],
+              title_subseries: row['series_title_subseries'],
+              title_subseries_transcription: row['series_title_subseries_transcription'],
+              volume_number_string: row['series_volume_number_string'],
+              creator_string: row['series_creator_string'],
             )
             series_statement.manifestation = manifestation
             series_statement.save!
@@ -700,19 +708,19 @@ class ResourceImportFile < ActiveRecord::Base
         end
       end
 
-      identifier = set_identifier(row)
+      identifiers = set_identifier(row)
 
       if manifestation.save
         Manifestation.transaction do
           if options[:edit_mode] == 'update'
-            unless identifier.empty?
-              identifier.map{|_k, v|
+            unless identifiers.empty?
+              identifiers.each do |v|
                 v.manifestation = manifestation
                 v.save!
-              }
+              end
             end
           else
-            manifestation.identifiers << identifier.map{|_k, v| v}
+            manifestation.identifiers << identifiers
           end
         end
 
@@ -744,17 +752,19 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   def set_identifier(row)
-    identifier = {}
+    identifiers = []
     %w(isbn issn doi jpno ncid).each do |id_type|
       if row["#{id_type}"].present?
-        import_id = Identifier.new(body: row["#{id_type}"])
-        identifier_type = IdentifierType.where(name: id_type).first
-        identifier_type = IdentifierType.where(name: id_type).create! unless identifier_type
-        import_id.identifier_type = identifier_type
-        identifier[:"#{id_type}"] = import_id if import_id.valid?
+        row[id_type].split(/\/\//).each do |identifier_s|
+          import_id = Identifier.new(body: identifier_s)
+          identifier_type = IdentifierType.find_by(name: id_type)
+          identifier_type = IdentifierType.create!(name: id_type) unless identifier_type
+          import_id.identifier_type = identifier_type
+          identifiers << import_id if import_id.valid?
+        end
       end
     end
-    identifier
+    identifiers
   end
 end