enju_biblio 0.1.0.pre58 → 0.1.0.pre59

data/app/models/manifestation_relationship_type.rb

@@ -1,7 +1,7 @@
 class ManifestationRelationshipType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'manifestation_relationship_types.position'
+  default_scope { order('manifestation_relationship_types.position') }
   has_many :manifestation_relationships
 end
 

data/app/models/medium_of_performance.rb

@@ -1,7 +1,7 @@
 class MediumOfPerformance < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'medium_of_performances.position'
+  default_scope { order('medium_of_performances.position') }
   has_many :works
 end
 

data/app/models/picture_file.rb

@@ -1,23 +1,23 @@
 class PictureFile < ActiveRecord::Base
   attr_accessible :picture, :picture_attachable_id,
     :picture_attachable_type
-  scope :attached, where('picture_attachable_id IS NOT NULL')
-  belongs_to :picture_attachable, :polymorphic => true, validate: true
+  scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
+  belongs_to :picture_attachable, polymorphic: true, validate: true
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :picture, :storage => :s3, :styles => { :medium => "600x600>", :thumb => "100x100>" },
-      :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
-      :s3_permissions => :private
+    has_attached_file :picture, storage: :s3, styles: { medium: "600x600>", thumb: "100x100>" },
+      s3_credentials: "#{Rails.root}/config/s3.yml",
+      s3_permissions: :private
   else
-    has_attached_file :picture, :styles => { :medium => "600x600>", :thumb => "100x100>" },
+    has_attached_file :picture, styles: { medium: "600x600>", thumb: "100x100>" },
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
   validates_attachment_presence :picture
-  validates_attachment_content_type :picture, :content_type => ["image/jpeg", "image/pjpeg", "image/png", "image/gif", "image/svg+xml"], on: :create
+  validates_attachment_content_type :picture, content_type: ["image/jpeg", "image/pjpeg", "image/png", "image/gif", "image/svg+xml"], on: :create
 
-  validates :picture_attachable_type, presence: true, :inclusion => {:in => ['Event', 'Manifestation', 'Agent', 'Shelf']}
+  validates :picture_attachable_type, presence: true, inclusion: { in: ['Event', 'Manifestation', 'Agent', 'Shelf'] }
   validates_associated :picture_attachable
-  default_scope order: 'picture_files.position'
+  default_scope { order('picture_files.position') }
   # http://railsforum.com/viewtopic.php?id=11615
   acts_as_list scope: 'picture_attachable_type=\'#{picture_attachable_type}\''
   normalize_attributes :picture_attachable_type

data/app/models/produce_type.rb

@@ -1,7 +1,7 @@
 class ProduceType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :position
   include MasterModel
-  default_scope order: 'produce_types.position'
+  default_scope { order('produce_types.position') }
 end
 
 # == Schema Information

data/app/models/realize_type.rb

@@ -1,7 +1,7 @@
 class RealizeType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :position
   include MasterModel
-  default_scope order: 'realize_types.position'
+  default_scope { order('realize_types.position') }
 end
 
 # == Schema Information

data/app/models/resource_import_file.rb

@@ -4,13 +4,13 @@ class ResourceImportFile < ActiveRecord::Base
   include ImportFile
   attr_accessible :resource_import, :edit_mode, :user_encoding, :mode,
     :default_shelf_id, :library_id
-  default_scope {order('resource_import_files.id DESC')}
-  scope :not_imported, -> {in_state(:pending)}
-  scope :stucked, -> {in_state(:pending).where('resource_import_files.created_at < ?', 1.hour.ago)}
+  default_scope { order('resource_import_files.id DESC') }
+  scope :not_imported, -> { in_state(:pending) }
+  scope :stucked, -> { in_state(:pending).where('resource_import_files.created_at < ?', 1.hour.ago) }
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :resource_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
-      :s3_permissions => :private
+      s3_permissions: :private
   else
     has_attached_file :resource_import,
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
@@ -55,32 +55,51 @@ class ResourceImportFile < ActiveRecord::Base
 
   def import
     transition_to!(:started)
-    num = {:manifestation_imported => 0, :item_imported => 0, :manifestation_found => 0, :item_found => 0, :failed => 0}
+    num = {
+      manifestation_imported: 0,
+      item_imported: 0,
+      manifestation_found: 0,
+      item_found: 0,
+      failed: 0
+    }
     rows = open_import_file(create_import_temp_file(resource_import))
     row_num = 1
 
-    field = rows.first
-    if [field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
-      raise "You should specify isbn or original_title in the first line"
-    end
+    #field = rows.first
+    #if [field['manifestation_id'], field['manifestation_identifier'], field['isbn'], field['original_title']].reject{|f|
+    #  f.to_s.strip == ''
+    #}.empty?
+    #  raise "You should specify isbn or original_title in the first line"
+    #end
 
     rows.each do |row|
       row_num += 1
-      next if row['dummy'].to_s.strip.present?
-      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, body: row.fields.join("\t"))
+      import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
+      if row['dummy'].to_s.strip.present?
+        import_result.error_message = "line #{row_num}: #{I18n.t('import.dummy')}"
+        import_result.save!
+        next
+      end
 
       item_identifier = row['item_identifier'].to_s.strip
       item = Item.where(item_identifier: item_identifier).first
       if item
         import_result.item = item
         import_result.manifestation = item.manifestation
+        import_result.error_message = "line #{row_num}: #{I18n.t('import.item_found')}"
         import_result.save!
         num[:item_found] += 1
         next
       end
 
       if row['manifestation_identifier'].present?
-        manifestation = Manifestation.where(:manifestation_identifier => row['manifestation_identifier'].to_s.strip).first
+        manifestation = Manifestation.where(manifestation_identifier: row['manifestation_identifier'].to_s.strip).first
+      end
+
+      unless manifestation
+        if row['manifestation_id'].present?
+          manifestation = Manifestation.where(id: row['manifestation_id'].to_s.strip).first
+        end
       end
 
       unless manifestation
@@ -108,7 +127,11 @@ class ResourceImportFile < ActiveRecord::Base
           end
         end
       end
-      num[:manifestation_found] += 1 if manifestation
+
+      if manifestation
+        import_result.error_message = "line #{row_num}: #{I18n.t('import.manifestation_found')}"
+        num[:manifestation_found] += 1
+      end
 
       if row['original_title'].blank?
         unless manifestation
@@ -131,7 +154,7 @@ class ResourceImportFile < ActiveRecord::Base
       end
       import_result.manifestation = manifestation
 
-      if manifestation and item_identifier.present?
+      if manifestation && item_identifier.present?
         import_result.item = create_item(row, manifestation)
         manifestation.index
       else
@@ -167,6 +190,7 @@ class ResourceImportFile < ActiveRecord::Base
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
+    save
     transition_to!(:failed)
     raise e
   end
@@ -213,16 +237,16 @@ class ResourceImportFile < ActiveRecord::Base
 
     # TODO
     for record in reader
-      manifestation = Manifestation.new(:original_title => expression.original_title)
+      manifestation = Manifestation.new(original_title: expression.original_title)
       manifestation.carrier_type = CarrierType.find(1)
       manifestation.frequency = Frequency.find(1)
       manifestation.language = Language.find(1)
       manifestation.save
 
       full_name = record['700']['a']
-      publisher = Agent.where(:full_name => record['700']['a']).first
+      publisher = Agent.where(full_name: record['700']['a']).first
       unless publisher
-        publisher = Agent.new(:full_name => full_name)
+        publisher = Agent.new(full_name: full_name)
         publisher.save
       end
       manifestation.publishers << publisher
@@ -296,7 +320,7 @@ class ResourceImportFile < ActiveRecord::Base
         item.save!
       else
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
-        manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first if manifestation_identifier.present?
+        manifestation = Manifestation.where(manifestation_identifier: manifestation_identifier).first if manifestation_identifier.present?
         unless manifestation
           manifestation = Manifestation.where(id: row['manifestation_id']).first
         end
@@ -308,6 +332,7 @@ class ResourceImportFile < ActiveRecord::Base
     transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
+    save
     transition_to!(:failed)
     raise e
   end
@@ -328,6 +353,7 @@ class ResourceImportFile < ActiveRecord::Base
     transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
+    save
     transition_to!(:failed)
     raise e
   end
@@ -345,17 +371,17 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
-      manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first
+      manifestation = Manifestation.where(manifestation_identifier: manifestation_identifier).first
       unless manifestation
         manifestation = Manifestation.where(id: row['manifestation_id'].to_s.strip).first
       end
 
-      if item and manifestation
+      if item && manifestation
         item.manifestation = manifestation
         item.save!
       end
 
-      import_result = ResourceImportResult.create!(:resource_import_file_id => self.id, body: row.fields.join("\t"))
+      import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
       import_result.item = item
       import_result.manifestation = manifestation
       import_result.save!
@@ -370,7 +396,7 @@ class ResourceImportFile < ActiveRecord::Base
     header_columns = %w(
       original_title manifestation_identifier item_identifier shelf note
       title_transcription title_alternative title_alternative_transcription
-      periodical manifestation_id publication_place carrier_type
+      serial manifestation_id publication_place carrier_type
       series_statement_identifier series_original_title series_creator_string
       series_title_transcription series_volume_number_string
       series_title_subseries series_title_subseries_transcription
@@ -381,7 +407,7 @@ class ResourceImportFile < ActiveRecord::Base
       edition edition_string serial_number isbn issn manifestation_price
       width height depth number_of_pages jpno lccn budget_type bookstore
       language fulltext_content required_role doi content_type frequency
-      extent_of_text start_page end_page
+      extent start_page end_page dimensions
       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
@@ -397,7 +423,7 @@ class ResourceImportFile < ActiveRecord::Base
       save!
     end
     rows = CSV.open(tempfile, headers: header, col_sep: "\t")
-    ResourceImportResult.create!(:resource_import_file_id => self.id, body: header.join("\t"))
+    ResourceImportResult.create!(resource_import_file_id: id, body: header.join("\t"))
     tempfile.close(true)
     file.close
     rows
@@ -405,26 +431,51 @@ class ResourceImportFile < ActiveRecord::Base
 
   def import_subject(row)
     subjects = []
-    row['subject'].to_s.split('//').each do |s|
-      # TODO: Subject typeの設定
-      subject = Subject.new(:term => s.to_s.strip)
-      subject.subject_type = SubjectType.where(name: 'concept').first
-      subject.subject_heading_type = SubjectHeadingType.where(name: 'unknown').first
-      subjects << subject
-    end
+    subject_list = YAML.load(row['subject'].to_s)
+    # TODO: Subject typeの設定
+    return subjects unless subject_list
+    subject_list.map{|k, v|
+      subject_heading_type = SubjectHeadingType.where(name: k.downcase).first
+      next unless subject_heading_type
+      if v.is_a?(Array)
+        v.each do |term|
+          subject = Subject.new(term: term)
+          subject.subject_heading_type = subject_heading_type
+          subject.subject_type = SubjectType.where(name: 'concept').first
+          subject.save!
+          subjects << subject
+        end
+      else
+        subject = Subject.new(term: v)
+        subject.subject_heading_type = subject_heading_type
+        subject.subject_type = SubjectType.where(name: 'concept').first
+        subject.save!
+        subjects << subject
+      end
+    }
     subjects
   end
 
   def import_classification(row)
     classifications = []
     classification_number = YAML.load(row['classification'].to_s)
-    return nil unless classification_number
+    return classifications unless classification_number
     classification_number.map{|k, v|
       classification_type = ClassificationType.where(name: k.downcase).first
-      classification = Classification.new(:category => v.to_s)
-      classification.classification_type = classification_type
-      classification.save!
-      classifications << classification
+      next unless classification_type
+      if v.is_a?(Array)
+        v.each do |category|
+          classification = Classification.new(category: category)
+          classification.classification_type = classification_type
+          classification.save!
+          classifications << classification
+        end
+      else
+        classification = Classification.new(category: v)
+        classification.classification_type = classification_type
+        classification.save!
+        classifications << classification
+      end
     }
     classifications
   end
@@ -472,7 +523,6 @@ class ResourceImportFile < ActiveRecord::Base
   end
 
   def fetch(row, options = {edit_mode: 'create'})
-    shelf = Shelf.where(name: row['shelf'].to_s.strip).first || Shelf.web
     case options[:edit_mode]
     when 'create'
       manifestation = nil
@@ -480,7 +530,7 @@ class ResourceImportFile < ActiveRecord::Base
       manifestation = Item.where(item_identifier: row['item_identifier'].to_s.strip).first.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(manifestation_identifier: manifestation_identifier).first if manifestation_identifier
         manifestation = Manifestation.where(id: row['manifestation_id']).first unless manifestation
       end
     end
@@ -497,15 +547,10 @@ class ResourceImportFile < ActiveRecord::Base
       title[:title_alternative_transcription] = manifestation.title_alternative_transcription if row['title_alternative_transcription'].to_s.strip.blank?
     end
     #title[:title_transcription_alternative] = row['title_transcription_alternative']
-    if title[:original_title].blank? and options[:edit_mode] == 'create'
+    if title[:original_title].blank? && options[:edit_mode] == 'create'
       return nil
     end
 
-    lisbn = Lisbn.new(row['isbn'].to_s.strip)
-    if lisbn.isbn.valid?
-      isbn = lisbn.isbn
-    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
@@ -515,25 +560,24 @@ class ResourceImportFile < ActiveRecord::Base
     content_type = ContentType.where(name: row['content_type'].to_s.strip).first
     frequency = Frequency.where(name: row['frequency'].to_s.strip).first
 
-    identifier = set_identifier(row)
-
+    fulltext_content = serial = nil
     if %w(t true).include?(row['fulltext_content'].to_s.downcase.strip)
       fulltext_content = true
     end
 
-    if %w(t true).include?(row['periodical'].to_s.downcase.strip)
-      periodical = true
+    if %w(t true).include?(row['serial'].to_s.downcase.strip)
+      serial = true
     end
 
     creators = row['creator'].to_s.split('//')
     creator_transcriptions = row['creator_transcription'].to_s.split('//')
-    creators_list = creators.zip(creator_transcriptions).map{|f,t| {:full_name => f.to_s.strip, :full_name_transcription => t.to_s.strip}}
+    creators_list = creators.zip(creator_transcriptions).map{|f,t| {full_name: f.to_s.strip, full_name_transcription: t.to_s.strip}}
     contributors = row['contributor'].to_s.split('//')
     contributor_transcriptions = row['contributor_transcription'].to_s.split('//')
-    contributors_list = contributors.zip(contributor_transcriptions).map{|f,t| {:full_name => f.to_s.strip, :full_name_transcription => t.to_s.strip}}
+    contributors_list = contributors.zip(contributor_transcriptions).map{|f,t| {full_name: f.to_s.strip, full_name_transcription: t.to_s.strip}}
     publishers = row['publisher'].to_s.split('//')
     publisher_transcriptions = row['publisher_transcription'].to_s.split('//')
-    publishers_list = publishers.zip(publisher_transcriptions).map{|f,t| {:full_name => f.to_s.strip, :full_name_transcription => t.to_s.strip}}
+    publishers_list = publishers.zip(publisher_transcriptions).map{|f,t| {full_name: f.to_s.strip, full_name_transcription: t.to_s.strip}}
     ResourceImportFile.transaction do
       creator_agents = Agent.import_agents(creators_list)
       contributor_agents = Agent.import_agents(contributors_list)
@@ -579,12 +623,12 @@ class ResourceImportFile < ActiveRecord::Base
         :statement_of_responsibility => row['statement_of_responsibility'],
         :access_address => row['access_address'],
         :manifestation_identifier => row['manifestation_identifier'],
-        :fulltext_content => fulltext_content,
         :publication_place => row['publication_place'],
-        :extent_of_text => row['extent_of_text'],
+        :extent => row['extent'],
+        :dimensions => row['dimensions'],
         :start_page => row['start_page'],
-        :end_page => row['end_page']
-      }.delete_if{|key, value| value.nil?}
+        :end_page => row['end_page'],
+      }.delete_if{|_key, value| value.nil?}
 
       manifestation = self.class.import_manifestation(expression, publisher_agents, attributes,
       {
@@ -592,13 +636,13 @@ class ResourceImportFile < ActiveRecord::Base
       })
 
       required_role = Role.where(name: row['required_role_name'].to_s.strip.camelize).first
-      if required_role and row['required_role_name'].present?
+      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
       end
 
-      if language and row['language'].present?
+      if language && row['language'].present?
         manifestation.language = language
       else
         manifestation.language = Language.where(name: 'unknown').first unless manifestation.language
@@ -609,6 +653,8 @@ class ResourceImportFile < ActiveRecord::Base
       manifestation.frequency = frequency if frequency
       #manifestation.start_page = row[:start_page].to_i if row[:start_page]
       #manifestation.end_page = row[:end_page].to_i if row[:end_page]
+      manifestation.serial = serial if row['serial']
+      manifestation.fulltext_content = fulltext_content if row['fulltext_content']
 
       if row['series_original_title'].to_s.strip.present?
         Manifestation.transaction do
@@ -630,18 +676,26 @@ class ResourceImportFile < ActiveRecord::Base
         end
       end
 
+      identifier = set_identifier(row)
+
       if manifestation.save
         Manifestation.transaction do
-          manifestation.identifiers.delete_all if manifestation.identifiers.exists?
-          identifier.each do |k, v|
-            manifestation.identifiers << v if v.valid?
+          if options[:edit_mode] == 'update'
+            unless identifier.empty?
+              identifier.map{|_k, v|
+                v.manifestation = manifestation
+                v.save!
+              }
+            end
+          else
+            manifestation.identifiers << identifier.map{|_k, v| v}
           end
         end
 
         if defined?(EnjuSubject)
           classifications = import_classification(row)
           if classifications.present?
-            manifestation.classifications << classifications
+            manifestation.classifications = classifications
           end
         end
       end
@@ -665,8 +719,9 @@ class ResourceImportFile < ActiveRecord::Base
     identifier = {}
     %w(isbn issn doi jpno).each do |id_type|
       if row["#{id_type}"].present?
-        identifier[:"#{id_type}"] = Identifier.new(body: row["#{id_type}"])
-        identifier[:"#{id_type}"].identifier_type = IdentifierType.where(name: id_type).first_or_create
+        import_id = Identifier.new(body: row["#{id_type}"])
+        import_id.identifier_type = IdentifierType.where(name: id_type).first_or_create
+        identifier[:"#{id_type}"] = import_id if import_id.valid?
       end
     end
     identifier