enju_biblio 0.1.0.pre10 → 0.1.0.pre11

data/app/models/patron_import_file.rb

@@ -12,7 +12,13 @@ class PatronImportFile < ActiveRecord::Base
     has_attached_file :patron_import,
       :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :patron_import, :content_type => ['text/csv', 'text/plain', 'text/tab-separated-values', 'application/octet-stream']
+  validates_attachment_content_type :patron_import, :content_type => [
+    'text/csv',
+    'text/plain',
+    'text/tab-separated-values',
+    'application/octet-stream',
+    'application/vnd.ms-excel'
+  ]
   validates_attachment_presence :patron_import
   belongs_to :user, :validate => true
   has_many :patron_import_results
@@ -183,7 +189,7 @@ class PatronImportFile < ActiveRecord::Base
       f.each{|line|
         if defined?(CharlockHolmes::EncodingDetector)
           begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect[:encoding])
+            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding])
           rescue StandardError
             string = NKF.nkf('-w -Lu', line)
           end
@@ -273,7 +279,7 @@ end
 #
 # Table name: patron_import_files
 #
-#  id                         :integer         not null, primary key
+#  id                         :integer          not null, primary key
 #  parent_id                  :integer
 #  content_type               :string(255)
 #  size                       :integer
@@ -285,8 +291,8 @@ end
 #  patron_import_content_type :string(255)
 #  patron_import_file_size    :integer
 #  patron_import_updated_at   :datetime
-#  created_at                 :datetime        not null
-#  updated_at                 :datetime        not null
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
 #  patron_import_fingerprint  :string(255)
 #  error_message              :text
 #  edit_mode                  :string(255)

data/app/models/patron_import_result.rb

@@ -15,12 +15,12 @@ end
 #
 # Table name: patron_import_results
 #
-#  id                    :integer         not null, primary key
+#  id                    :integer          not null, primary key
 #  patron_import_file_id :integer
 #  patron_id             :integer
 #  user_id               :integer
 #  body                  :text
-#  created_at            :datetime
-#  updated_at            :datetime
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #
 

data/app/models/patron_relationship.rb

@@ -16,12 +16,12 @@ end
 #
 # Table name: patron_relationships
 #
-#  id                          :integer         not null, primary key
+#  id                          :integer          not null, primary key
 #  parent_id                   :integer
 #  child_id                    :integer
 #  patron_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/patron_relationship_type.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: patron_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/patron_type.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: patron_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/picture_file.rb

@@ -29,15 +29,15 @@ end
 #
 # Table name: picture_files
 #
-#  id                      :integer         not null, primary key
+#  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string(255)
 #  content_type            :string(255)
 #  title                   :text
 #  thumbnail               :string(255)
 #  position                :integer
-#  created_at              :datetime        not null
-#  updated_at              :datetime        not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
 #  picture_file_name       :string(255)
 #  picture_content_type    :string(255)
 #  picture_file_size       :integer

data/app/models/produce.rb

@@ -19,17 +19,16 @@ class Produce < ActiveRecord::Base
   end
 end
 
-
 # == Schema Information
 #
 # Table name: produces
 #
-#  id               :integer         not null, primary key
-#  patron_id        :integer         not null
-#  manifestation_id :integer         not null
+#  id               :integer          not null, primary key
+#  patron_id        :integer          not null
+#  manifestation_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
 #  produce_type_id  :integer
 #
 

data/app/models/produce_type.rb

@@ -8,12 +8,12 @@ end
 #
 # Table name: produce_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/realize.rb

@@ -18,17 +18,16 @@ class Realize < ActiveRecord::Base
   end
 end
 
-
 # == Schema Information
 #
 # Table name: realizes
 #
-#  id              :integer         not null, primary key
-#  patron_id       :integer         not null
-#  expression_id   :integer         not null
+#  id              :integer          not null, primary key
+#  patron_id       :integer          not null
+#  expression_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
 #  realize_type_id :integer
 #
 

data/app/models/realize_type.rb

@@ -8,12 +8,12 @@ end
 #
 # Table name: realize_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/resource_import_file.rb

@@ -13,7 +13,13 @@ class ResourceImportFile < ActiveRecord::Base
     has_attached_file :resource_import,
       :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :resource_import, :content_type => ['text/csv', 'text/plain', 'text/tab-separated-values', 'application/octet-stream']
+  validates_attachment_content_type :resource_import, :content_type => [
+    'text/csv',
+    'text/plain',
+    'text/tab-separated-values',
+    'application/octet-stream',
+    'application/vnd.ms-excel'
+  ]
   validates_attachment_presence :resource_import
   belongs_to :user, :validate => true
   has_many :resource_import_results
@@ -63,7 +69,7 @@ class ResourceImportFile < ActiveRecord::Base
     row_num = 2
 
     field = rows.first
-    if [field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
+    if [field['print_isbn'], field['online_isbn'], field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
       raise "You should specify isbn or original_tile in the first line"
     end
 
@@ -90,13 +96,21 @@ class ResourceImportFile < ActiveRecord::Base
       end
 
       unless manifestation
-        if row['isbn'].present?
+        if row['online_isbn'].present?
+          isbn = StdNum::ISBN.normalize(row['online_isbn'])
+          m = Manifestation.find_by_isbn(isbn)
+        end
+        if row['print_isbn'].present? and !m
+          isbn = StdNum::ISBN.normalize(row['print_isbn'])
+          m = Manifestation.find_by_isbn(isbn)
+        end
+        if row['isbn'].present? and !m
           isbn = StdNum::ISBN.normalize(row['isbn'])
           m = Manifestation.find_by_isbn(isbn)
-          if m
-            unless m.series_statement
-              manifestation = m
-            end
+        end
+        if m
+          unless m.series_statement
+            manifestation = m
           end
         end
       end
@@ -129,6 +143,18 @@ class ResourceImportFile < ActiveRecord::Base
         import_result.item = create_item(row, manifestation)
         manifestation.index
       else
+        if manifestation.try(:fulltext_content?)
+          item = Item.new
+          item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+          item.shelf = Shelf.web
+          begin
+            item.acquired_at = Time.zone.parse(row['acquired_at'].to_s.strip)
+          rescue ArgumentError
+          end
+          item.manifestation_id = manifestation.id
+          item.save!
+          manifestation.items << item
+        end
         num[:failed] += 1
       end
 
@@ -346,7 +372,7 @@ class ResourceImportFile < ActiveRecord::Base
       f.each{|line|
         if defined?(CharlockHolmes::EncodingDetector)
           begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect[:encoding])
+            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding])
           rescue StandardError
             string = NKF.nkf('-w -Lu', line)
           end
@@ -437,10 +463,23 @@ class ResourceImportFile < ActiveRecord::Base
       return nil
     end
 
-    lisbn = Lisbn.new(row['isbn'].to_s.strip)
+    lisbn = Lisbn.new(row['print_isbn'].to_s.strip)
     if lisbn.isbn.valid?
       isbn = lisbn.isbn
     end
+
+    unless isbn
+      lisbn = Lisbn.new(row['isbn'].to_s.strip)
+      if lisbn.isbn.valid?
+        isbn = lisbn.isbn
+      end
+    end
+
+    online_lisbn = Lisbn.new(row['online_isbn'].to_s.strip)
+    if online_lisbn.isbn.valid?
+      online_isbn = lisbn.isbn
+    end
+
     # TODO: 小数点以下の表現
     width = NKF.nkf('-eZ1', row['width'].to_s).gsub(/\D/, '').to_i
     height = NKF.nkf('-eZ1', row['height'].to_s).gsub(/\D/, '').to_i
@@ -449,6 +488,8 @@ class ResourceImportFile < ActiveRecord::Base
     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
+    
+    carrier_type = CarrierType.where(:name => row['carrier_type'].to_s.strip).first
 
     if end_page >= 1
       start_page = 1
@@ -457,6 +498,10 @@ class ResourceImportFile < ActiveRecord::Base
       end_page = nil
     end
 
+    if row['fulltext_content'].to_s.strip == "t"
+      fulltext_content = 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}}
@@ -501,6 +546,7 @@ class ResourceImportFile < ActiveRecord::Base
         :title_alternative => title[:title_alternative],
         :title_alternative_transcription => title[:title_alternative_transcription],
         :isbn => isbn,
+        :online_isbn => online_isbn,
         :wrong_isbn => row['wrong_isbn'],
         :issn => row['issn'],
         :lccn => row['lccn'],
@@ -521,8 +567,10 @@ class ResourceImportFile < ActiveRecord::Base
         :note => row['note'],
         :start_page => start_page,
         :end_page => end_page,
-        :access_address => row['access_addres'],
-        :manifestation_identifier => row['manifestation_identifier']
+        :access_address => row['access_address'],
+        :doi => row['doi'],
+        :manifestation_identifier => row['manifestation_identifier'],
+        :fulltext_content => fulltext_content
       }.delete_if{|key, value| value.nil?}
       manifestation = self.class.import_manifestation(expression, publisher_patrons, attributes,
       {
@@ -543,6 +591,8 @@ class ResourceImportFile < ActiveRecord::Base
         manifestation.language = Language.where(:name => 'unknown').first unless manifestation.language
       end
 
+      manifestation.carrier_type = carrier_type if carrier_type
+
       manifestation.series_statement = series_statement if series_statement
       manifestation.save!
 
@@ -614,7 +664,7 @@ end
 #
 # Table name: resource_import_files
 #
-#  id                           :integer         not null, primary key
+#  id                           :integer          not null, primary key
 #  parent_id                    :integer
 #  content_type                 :string(255)
 #  size                         :integer
@@ -626,8 +676,8 @@ end
 #  resource_import_content_type :string(255)
 #  resource_import_file_size    :integer
 #  resource_import_updated_at   :datetime
-#  created_at                   :datetime        not null
-#  updated_at                   :datetime        not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
 #  edit_mode                    :string(255)
 #  resource_import_fingerprint  :string(255)
 #  error_message                :text

data/app/models/resource_import_result.rb

@@ -15,12 +15,12 @@ end
 #
 # Table name: resource_import_results
 #
-#  id                      :integer         not null, primary key
+#  id                      :integer          not null, primary key
 #  resource_import_file_id :integer
 #  manifestation_id        :integer
 #  item_id                 :integer
 #  body                    :text
-#  created_at              :datetime
-#  updated_at              :datetime
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
 #
 

data/app/models/series_has_manifestation.rb

@@ -25,11 +25,11 @@ end
 #
 # Table name: series_has_manifestations
 #
-#  id                  :integer         not null, primary key
+#  id                  :integer          not null, primary key
 #  series_statement_id :integer
 #  manifestation_id    :integer
 #  position            :integer
-#  created_at          :datetime
-#  updated_at          :datetime
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #
 

data/app/models/series_statement.rb

@@ -3,6 +3,7 @@ class SeriesStatement < ActiveRecord::Base
     :numbering_subseries, :title_transcription, :title_alternative,
     :series_statement_identifier, :issn, :periodical, :note,
     :title_subseries_transcription
+  attr_accessible :url, :frequency_id
 
   has_many :series_has_manifestations, :dependent => :destroy
   has_many :manifestations, :through => :series_has_manifestations
@@ -11,7 +12,7 @@ class SeriesStatement < ActiveRecord::Base
   has_many :parent_relationships, :foreign_key => 'child_id', :class_name => 'SeriesStatementRelationship', :dependent => :destroy
   has_many :children, :through => :child_relationships, :source => :child
   has_many :parents, :through => :parent_relationships, :source => :parent
-
+  belongs_to :frequency
   validates_presence_of :original_title
   validate :check_issn
   before_save :create_root_manifestation, :destroy_root_manifestation
@@ -42,7 +43,16 @@ class SeriesStatement < ActiveRecord::Base
   paginates_per 10
 
   def last_issue
-    manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first || manifestations.order(:id).last
+    issue = manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
+    unless issue
+      issues = manifestations.order('manifestations.id DESC').limit(2)
+      if issues[0] == root_manifestation
+        issue = issues[1]
+      else
+        issue = issues[0]
+      end
+    end
+    issue
   end
 
   def check_issn
@@ -99,25 +109,23 @@ class SeriesStatement < ActiveRecord::Base
   end
 end
 
-
-
 # == Schema Information
 #
 # Table name: series_statements
 #
-#  id                            :integer         not null, primary key
+#  id                            :integer          not null, primary key
 #  original_title                :text
 #  numbering                     :text
 #  title_subseries               :text
 #  numbering_subseries           :text
 #  position                      :integer
-#  created_at                    :datetime        not null
-#  updated_at                    :datetime        not null
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #  title_transcription           :text
 #  title_alternative             :text
 #  series_statement_identifier   :string(255)
 #  issn                          :string(255)
-#  periodical                    :boolean
+#  periodical                    :boolean          default(FALSE), not null
 #  root_manifestation_id         :integer
 #  note                          :text
 #  title_subseries_transcription :text

data/app/models/series_statement_relationship.rb

@@ -15,3 +15,16 @@ class SeriesStatementRelationship < ActiveRecord::Base
     Sunspot.commit
   end
 end
+
+# == Schema Information
+#
+# Table name: series_statement_relationships
+#
+#  id         :integer          not null, primary key
+#  parent_id  :integer
+#  child_id   :integer
+#  position   :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+

data/db/migrate/20120516020924_add_online_isbn_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddOnlineIsbnToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :online_isbn, :string
+  end
+end

data/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddFulltextContentToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :fulltext_content, :boolean
+  end
+end

data/db/migrate/20121116033446_add_doi_to_manifestation.rb

@@ -0,0 +1,6 @@
+class AddDoiToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :doi, :string
+    add_index :manifestations, :doi
+  end
+end

data/db/migrate/20121119153944_add_manifestation_id_to_item.rb

@@ -0,0 +1,5 @@
+class AddManifestationIdToItem < ActiveRecord::Migration
+  def change
+    add_column :items, :manifestation_id, :integer
+  end
+end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre10"
+  VERSION = "0.1.0.pre11"
 end

data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb

@@ -6,7 +6,7 @@ class CreateLendingPolicies < ActiveRecord::Migration
       t.integer :loan_period, :default => 0, :null => false
       t.datetime :fixed_due_date
       t.integer :renewal, :default => 0, :null => false
-      t.decimal :fine, :default => 0, :null => false
+      t.integer :fine, :default => 0, :null => false
       t.text :note
       t.integer :position
 

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120728204337) do
+ActiveRecord::Schema.define(:version => 20121119153944) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -440,6 +440,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
     t.datetime "acquired_at"
     t.integer  "bookstore_id"
     t.integer  "budget_type_id"
+    t.integer  "manifestation_id"
   end
 
   add_index "items", ["bookstore_id"], :name => "index_items_on_bookstore_id"
@@ -466,16 +467,16 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
   add_index "languages", ["name"], :name => "index_languages_on_name", :unique => true
 
   create_table "lending_policies", :force => true do |t|
-    t.integer  "item_id",                         :null => false
-    t.integer  "user_group_id",                   :null => false
-    t.integer  "loan_period",    :default => 0,   :null => false
+    t.integer  "item_id",                       :null => false
+    t.integer  "user_group_id",                 :null => false
+    t.integer  "loan_period",    :default => 0, :null => false
     t.datetime "fixed_due_date"
-    t.integer  "renewal",        :default => 0,   :null => false
-    t.decimal  "fine",           :default => 0.0, :null => false
+    t.integer  "renewal",        :default => 0, :null => false
+    t.integer  "fine",           :default => 0, :null => false
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
   end
 
   add_index "lending_policies", ["item_id", "user_group_id"], :name => "index_lending_policies_on_item_id_and_user_group_id", :unique => true
@@ -645,18 +646,19 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
     t.integer  "year_of_publication"
     t.text     "attachment_meta"
     t.integer  "month_of_publication"
+    t.string   "online_isbn"
+    t.boolean  "fulltext_content"
+    t.string   "doi"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
-  add_index "manifestations", ["carrier_type_id"], :name => "index_manifestations_on_carrier_type_id"
-  add_index "manifestations", ["frequency_id"], :name => "index_manifestations_on_frequency_id"
+  add_index "manifestations", ["doi"], :name => "index_manifestations_on_doi"
   add_index "manifestations", ["isbn"], :name => "index_manifestations_on_isbn"
   add_index "manifestations", ["issn"], :name => "index_manifestations_on_issn"
   add_index "manifestations", ["lccn"], :name => "index_manifestations_on_lccn"
   add_index "manifestations", ["manifestation_identifier"], :name => "index_manifestations_on_manifestation_identifier"
   add_index "manifestations", ["nbn"], :name => "index_manifestations_on_nbn"
   add_index "manifestations", ["oclc_number"], :name => "index_manifestations_on_oclc_number"
-  add_index "manifestations", ["required_role_id"], :name => "index_manifestations_on_required_role_id"
   add_index "manifestations", ["updated_at"], :name => "index_manifestations_on_updated_at"
 
   create_table "medium_of_performances", :force => true do |t|

data/spec/fixtures/carrier_types.yml

@@ -40,12 +40,12 @@ carrier_type_00003:
 #
 # 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/spec/fixtures/content_types.yml

@@ -25,12 +25,12 @@ three:
 #
 # 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
 #