enju_biblio 0.1.0.pre10 → 0.1.0.pre11

data/app/models/accept.rb

@@ -22,15 +22,16 @@ class Accept < ActiveRecord::Base
     item.save(:validate => false)
   end
 end
+
 # == Schema Information
 #
 # Table name: accepts
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  basket_id    :integer
 #  item_id      :integer
 #  librarian_id :integer
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/carrier_type.rb

@@ -23,12 +23,12 @@ end
 #
 # Table name: carrier_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/content_type.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: content_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/country.rb

@@ -33,8 +33,8 @@ end
 #
 # Table name: countries
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  alpha_2      :string(255)
 #  alpha_3      :string(255)

data/app/models/create.rb

@@ -18,17 +18,16 @@ class Create < ActiveRecord::Base
   end
 end
 
-
 # == Schema Information
 #
 # Table name: creates
 #
-#  id             :integer         not null, primary key
-#  patron_id      :integer         not null
-#  work_id        :integer         not null
+#  id             :integer          not null, primary key
+#  patron_id      :integer          not null
+#  work_id        :integer          not null
 #  position       :integer
-#  created_at     :datetime        not null
-#  updated_at     :datetime        not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
 #  create_type_id :integer
 #
 

data/app/models/create_type.rb

@@ -8,12 +8,12 @@ end
 #
 # Table name: create_types
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  name         :string(255)
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/donate.rb

@@ -10,10 +10,10 @@ end
 #
 # Table name: donates
 #
-#  id         :integer         not null, primary key
-#  patron_id  :integer         not null
-#  item_id    :integer         not null
-#  created_at :datetime
-#  updated_at :datetime
+#  id         :integer          not null, primary key
+#  patron_id  :integer          not null
+#  item_id    :integer          not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 

data/app/models/exemplify.rb

@@ -16,27 +16,17 @@ class Exemplify < ActiveRecord::Base
     manifestation.try(:index)
     item.try(:index)
   end
-
-  if defined?(EnjuCirculation)
-    after_create :create_lending_policy
-
-    def create_lending_policy
-      UserGroupHasCheckoutType.available_for_item(item).each do |rule|
-        LendingPolicy.create!(:item_id => item.id, :user_group_id => rule.user_group_id, :fixed_due_date => rule.fixed_due_date, :loan_period => rule.checkout_period, :renewal => rule.checkout_renewal_limit)
-      end
-    end
-  end
 end
 
 # == Schema Information
 #
 # Table name: exemplifies
 #
-#  id               :integer         not null, primary key
-#  manifestation_id :integer         not null
-#  item_id          :integer         not null
+#  id               :integer          not null, primary key
+#  manifestation_id :integer          not null
+#  item_id          :integer          not null
 #  position         :integer
-#  created_at       :datetime        not null
-#  updated_at       :datetime        not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/app/models/extent.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: extents
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/form_of_work.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: form_of_works
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/frequency.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: frequencies
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/import_request.rb

@@ -57,12 +57,12 @@ end
 #
 # Table name: import_requests
 #
-#  id               :integer         not null, primary key
+#  id               :integer          not null, primary key
 #  isbn             :string(255)
 #  state            :string(255)
 #  manifestation_id :integer
 #  user_id          :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/app/models/item.rb

@@ -49,7 +49,7 @@ class Item < ActiveRecord::Base
 
   enju_circulation_item_model if defined?(EnjuCirculation)
 
-  attr_accessor :library_id, :manifestation_id
+  attr_accessor :library_id
 
   if defined?(EnjuInventory)
     has_many :inventories, :dependent => :destroy
@@ -152,29 +152,31 @@ class Item < ActiveRecord::Base
     end
   end
 end
+
 # == Schema Information
 #
 # Table name: items
 #
-#  id                    :integer         not null, primary key
+#  id                    :integer          not null, primary key
 #  call_number           :string(255)
 #  item_identifier       :string(255)
-#  circulation_status_id :integer         default(5), not null
-#  checkout_type_id      :integer         default(1), not null
-#  created_at            :datetime        not null
-#  updated_at            :datetime        not null
+#  circulation_status_id :integer          default(5), not null
+#  checkout_type_id      :integer          default(1), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #  deleted_at            :datetime
-#  shelf_id              :integer         default(1), not null
-#  include_supplements   :boolean         default(FALSE), not null
+#  shelf_id              :integer          default(1), not null
+#  include_supplements   :boolean          default(FALSE), not null
 #  note                  :text
 #  url                   :string(255)
 #  price                 :integer
-#  lock_version          :integer         default(0), not null
-#  required_role_id      :integer         default(1), not null
+#  lock_version          :integer          default(0), not null
+#  required_role_id      :integer          default(1), not null
 #  state                 :string(255)
-#  required_score        :integer         default(0), not null
+#  required_score        :integer          default(0), not null
 #  acquired_at           :datetime
 #  bookstore_id          :integer
 #  budget_type_id        :integer
+#  manifestation_id      :integer
 #
 

data/app/models/language.rb

@@ -35,8 +35,8 @@ end
 #
 # Table name: languages
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  native_name  :string(255)
 #  display_name :text
 #  iso_639_1    :string(255)

data/app/models/license.rb

@@ -8,12 +8,12 @@ end
 #
 # Table name: licenses
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :string(255)
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/manifestation.rb

@@ -11,6 +11,8 @@ class Manifestation < ActiveRecord::Base
     :pub_date, :edition_string, :volume_number, :issue_number, :serial_number,
     :ndc, :content_type_id, :online_isbn, :attachment,
     :series_has_manifestation_attributes
+  attr_accessible :fulltext_content, :online_isbn,
+    :doi, :number_of_page_string
 
   scope :periodical_master, where(:periodical => false)
   scope :periodical_children, where(:periodical => true)
@@ -64,7 +66,7 @@ class Manifestation < ActiveRecord::Base
       publisher.join('').gsub(/\s/, '').downcase
     end
     string :isbn, :multiple => true do
-      [isbn, isbn10, wrong_isbn]
+      [isbn, isbn10, wrong_isbn, online_isbn]
     end
     string :issn, :multiple => true do
       if series_statement
@@ -86,7 +88,11 @@ class Manifestation < ActiveRecord::Base
       end
     end
     string :language do
-      language.try(:name)
+      if periodical_master?
+        series_statement.last_issue.try(:language).try(:name)
+      else
+        language.try(:name)
+      end
     end
     string :item_identifier, :multiple => true do
       if periodical_master?
@@ -102,7 +108,11 @@ class Manifestation < ActiveRecord::Base
     time :updated_at
     time :deleted_at
     time :pub_date, :multiple => true do
-      pub_dates
+      if periodical_master?
+        series_statement.manifestations.map{|m| m.pub_dates}.flatten
+      else
+        pub_dates
+      end
     end
     time :date_of_publication
     integer :creator_ids, :multiple => true
@@ -114,9 +124,9 @@ class Manifestation < ActiveRecord::Base
     integer :height
     integer :width
     integer :depth
-    integer :volume_number, :multiple => true
-    integer :issue_number, :multiple => true
-    integer :serial_number, :multiple => true
+    integer :volume_number
+    integer :issue_number
+    integer :serial_number
     integer :start_page
     integer :end_page
     integer :number_of_pages
@@ -127,10 +137,10 @@ class Manifestation < ActiveRecord::Base
     boolean :repository_content
     # for OpenURL
     text :aulast do
-      creators.map{|creator| creator.last_name}
+      creators.pluck(:last_name)
     end
     text :aufirst do
-      creators.map{|creator| creator.first_name}
+      creators.pluck(:first_name)
     end
     # OTC start
     string :creator, :multiple => true do
@@ -153,7 +163,7 @@ class Manifestation < ActiveRecord::Base
       end
     end
     text :isbn do  # 前方一致検索のためtext指定を追加
-      [isbn, isbn10, wrong_isbn]
+      [isbn, isbn10, wrong_isbn, online_isbn]
     end
     text :issn do # 前方一致検索のためtext指定を追加
       if series_statement
@@ -163,6 +173,7 @@ class Manifestation < ActiveRecord::Base
       end
     end
     string :sort_title
+    string :doi
     boolean :periodical do
       periodical?
     end
@@ -219,6 +230,11 @@ class Manifestation < ActiveRecord::Base
         errors.add(:isbn)
       end
     end
+    if online_isbn.present?
+      unless StdNum::ISBN.valid?(online_isbn)
+        errors.add(:online_isbn)
+      end
+    end
   end
 
   def check_issn
@@ -263,8 +279,12 @@ class Manifestation < ActiveRecord::Base
 
   def set_date_of_publication
     return if pub_date.blank?
-    date = nil
-    pub_date_string = pub_date.gsub(/[\[\]]/, '')
+    begin
+      date = Time.zone.parse(pub_date)
+    rescue ArgumentError, TZInfo::AmbiguousTime
+      date = nil
+    end
+    pub_date_string = pub_date.split(';').first.gsub(/[\[\]]/, '')
 
     while date.nil? do
       pub_date_string += '-01'
@@ -410,13 +430,15 @@ class Manifestation < ActiveRecord::Base
   end
 
   def self.find_by_isbn(isbn)
+    online_lisbn = Lisbn.new(isbn.to_s)
+    if online_lisbn.valid?
+      manifestation = Manifestation.where(:online_isbn => online_lisbn.isbn).first || Manifestation.where(:online_isbn => online_lisbn.isbn10).first
+      return manifestation if manifestation
+    end
+
     lisbn = Lisbn.new(isbn.to_s)
     if lisbn.valid?
-      if lisbn.isbn.size == 10
-        Manifestation.where(:isbn => lisbn.isbn13).first || Manifestation.where(:isbn => lisbn.isbn10).first
-      else
-        Manifestation.where(:isbn => lisbn.isbn13).first || Manifestation.where(:isbn => lisbn.isbn10).first
-      end
+      Manifestation.where(:isbn => lisbn.isbn13).first || Manifestation.where(:isbn => lisbn.isbn10).first
     end
   end
 
@@ -622,21 +644,21 @@ end
 #
 # Table name: manifestations
 #
-#  id                              :integer         not null, primary key
-#  original_title                  :text            not null
+#  id                              :integer          not null, primary key
+#  original_title                  :text             not null
 #  title_alternative               :text
 #  title_transcription             :text
 #  classification_number           :string(255)
 #  manifestation_identifier        :string(255)
 #  date_of_publication             :datetime
 #  date_copyrighted                :datetime
-#  created_at                      :datetime        not null
-#  updated_at                      :datetime        not null
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
 #  deleted_at                      :datetime
 #  access_address                  :string(255)
-#  language_id                     :integer         default(1), not null
-#  carrier_type_id                 :integer         default(1), not null
-#  extent_id                       :integer         default(1), not null
+#  language_id                     :integer          default(1), not null
+#  carrier_type_id                 :integer          default(1), not null
+#  extent_id                       :integer          default(1), not null
 #  start_page                      :integer
 #  end_page                        :integer
 #  height                          :integer
@@ -656,13 +678,13 @@ end
 #  serial_number_string            :string(255)
 #  edition                         :integer
 #  note                            :text
-#  repository_content              :boolean         default(FALSE), not null
-#  lock_version                    :integer         default(0), not null
-#  required_role_id                :integer         default(1), not null
+#  repository_content              :boolean          default(FALSE), not null
+#  lock_version                    :integer          default(0), not null
+#  required_role_id                :integer          default(1), not null
 #  state                           :string(255)
-#  required_score                  :integer         default(0), not null
-#  frequency_id                    :integer         default(1), not null
-#  subscription_master             :boolean         default(FALSE), not null
+#  required_score                  :integer          default(0), not null
+#  frequency_id                    :integer          default(1), not null
+#  subscription_master             :boolean          default(FALSE), not null
 #  attachment_file_name            :string(255)
 #  attachment_content_type         :string(255)
 #  attachment_file_size            :integer
@@ -681,9 +703,12 @@ end
 #  issue_number                    :integer
 #  serial_number                   :integer
 #  ndc                             :string(255)
-#  content_type_id                 :integer         default(1)
+#  content_type_id                 :integer          default(1)
 #  year_of_publication             :integer
 #  attachment_meta                 :text
 #  month_of_publication            :integer
+#  online_isbn                     :string(255)
+#  fulltext_content                :boolean
+#  doi                             :string(255)
 #
 

data/app/models/manifestation_relationship.rb

@@ -19,12 +19,12 @@ end
 #
 # Table name: manifestation_relationships
 #
-#  id                                 :integer         not null, primary key
+#  id                                 :integer          not null, primary key
 #  parent_id                          :integer
 #  child_id                           :integer
 #  manifestation_relationship_type_id :integer
-#  created_at                         :datetime
-#  updated_at                         :datetime
+#  created_at                         :datetime         not null
+#  updated_at                         :datetime         not null
 #  position                           :integer
 #
 

data/app/models/manifestation_relationship_type.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: manifestation_relationship_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/medium_of_performance.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: medium_of_performances
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/own.rb

@@ -23,11 +23,11 @@ end
 #
 # Table name: owns
 #
-#  id         :integer         not null, primary key
-#  patron_id  :integer         not null
-#  item_id    :integer         not null
+#  id         :integer          not null, primary key
+#  patron_id  :integer          not null
+#  item_id    :integer          not null
 #  position   :integer
-#  created_at :datetime        not null
-#  updated_at :datetime        not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #
 

data/app/models/patron.rb

@@ -258,12 +258,11 @@ class Patron < ActiveRecord::Base
   end
 end
 
-
 # == Schema Information
 #
 # Table name: patrons
 #
-#  id                                  :integer         not null, primary key
+#  id                                  :integer          not null, primary key
 #  user_id                             :integer
 #  last_name                           :string(255)
 #  middle_name                         :string(255)
@@ -276,8 +275,8 @@ end
 #  full_name                           :string(255)
 #  full_name_transcription             :text
 #  full_name_alternative               :text
-#  created_at                          :datetime        not null
-#  updated_at                          :datetime        not null
+#  created_at                          :datetime         not null
+#  updated_at                          :datetime         not null
 #  deleted_at                          :datetime
 #  zip_code_1                          :string(255)
 #  zip_code_2                          :string(255)
@@ -297,18 +296,19 @@ end
 #  region                              :text
 #  date_of_birth                       :datetime
 #  date_of_death                       :datetime
-#  language_id                         :integer         default(1), not null
-#  country_id                          :integer         default(1), not null
-#  patron_type_id                      :integer         default(1), not null
-#  lock_version                        :integer         default(0), not null
+#  language_id                         :integer          default(1), not null
+#  country_id                          :integer          default(1), not null
+#  patron_type_id                      :integer          default(1), not null
+#  lock_version                        :integer          default(0), not null
 #  note                                :text
-#  required_role_id                    :integer         default(1), not null
-#  required_score                      :integer         default(0), not null
+#  required_role_id                    :integer          default(1), not null
+#  required_score                      :integer          default(0), not null
 #  state                               :string(255)
 #  email                               :text
 #  url                                 :text
 #  full_name_alternative_transcription :text
 #  birth_date                          :string(255)
 #  death_date                          :string(255)
+#  patron_identifier                   :string(255)
 #