enju_biblio 0.1.0.pre37 → 0.1.0.pre38

data/app/models/identifier_type.rb

@@ -0,0 +1,21 @@
+class IdentifierType < ActiveRecord::Base
+  attr_accessible :display_name, :name, :note, :position
+  include MasterModel
+  default_scope :order => "identifier_types.position"
+  has_many :identifiers
+  validates :name, :format => {:with => /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}
+end
+
+# == Schema Information
+#
+# Table name: identifier_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/app/models/import_request.rb

@@ -35,6 +35,7 @@ class ImportRequest < ActiveRecord::Base
   end
 
   def import!
+    return nil unless Manifestation.respond_to?(:import_isbn)
     unless manifestation
       manifestation = Manifestation.import_isbn(isbn)
       if manifestation

data/app/models/manifestation.rb

@@ -12,8 +12,8 @@ class Manifestation < ActiveRecord::Base
   attr_accessible :original_title, :title_alternative, :title_transcription,
     :manifestation_identifier, :date_copyrighted,
     :access_address, :language_id, :carrier_type_id, :extent_id, :start_page,
-    :end_page, :height, :width, :depth, :isbn, :wrong_isbn, :nbn, :lccn,
-    :oclc_number, :issn, :price, :fulltext, :volume_number_string,
+    :end_page, :height, :width, :depth,
+    :price, :fulltext, :volume_number_string,
     :issue_number_string, :serial_number_string, :edition, :note,
     :repository_content, :required_role_id, :frequency_id,
     :title_alternative_transcription, :description, :abstract, :available_at,
@@ -21,7 +21,8 @@ class Manifestation < ActiveRecord::Base
     :pub_date, :edition_string, :volume_number, :issue_number, :serial_number,
     :ndc, :content_type_id, :attachment, :classification_number,
     :series_statements_attributes, :periodical,
-    :creators_attributes, :contributors_attributes, :publishers_attributes
+    :creators_attributes, :contributors_attributes, :publishers_attributes,
+    :identifiers_attributes
   attr_accessible :fulltext_content,
     :doi, :number_of_page_string, :parent_id
 
@@ -46,11 +47,13 @@ class Manifestation < ActiveRecord::Base
   belongs_to :frequency
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id', :validate => true
   has_one :resource_import_result
+  has_many :identifiers
   belongs_to :nii_type if defined?(EnjuNii)
   accepts_nested_attributes_for :creators, :allow_destroy => true, :reject_if => :all_blank
   accepts_nested_attributes_for :contributors, :allow_destroy => true, :reject_if => :all_blank
   accepts_nested_attributes_for :publishers, :allow_destroy => true, :reject_if => :all_blank
   accepts_nested_attributes_for :series_statements, :allow_destroy => true, :reject_if => :all_blank
+  accepts_nested_attributes_for :identifiers, :allow_destroy => true, :reject_if => :all_blank
 
   searchable do
     text :title, :default_boost => 2 do
@@ -78,17 +81,21 @@ class Manifestation < ActiveRecord::Base
       publisher.join('').gsub(/\s/, '').downcase
     end
     string :isbn, :multiple => true do
-      [isbn, isbn10, wrong_isbn]
+      identifier_contents(:isbn)
     end
     string :issn, :multiple => true do
       if series_statements.exists?
-        [issn, (series_statements.map{|s| s.manifestation.issn})].flatten.uniq.compact
+        [identifier_contents(:issn), (series_statements.map{|s| s.manifestation.identifier_contents(:issn)})].flatten.uniq.compact
       else
-        issn
+        identifier_contents(:issn)
       end
     end
-    string :lccn
-    string :nbn
+    string :lccn, :multiple => true do
+      identifier_contents(:lccn)
+    end
+    string :nbn, :multiple => true do
+      identifier_contents(:nbn)
+    end
     string :carrier_type do
       carrier_type.name
     end
@@ -179,13 +186,13 @@ class Manifestation < ActiveRecord::Base
       end
     end
     text :isbn do  # 前方一致検索のためtext指定を追加
-      [isbn, isbn10, wrong_isbn]
+      identifier_contents(:isbn)
     end
     text :issn do # 前方一致検索のためtext指定を追加
       if series_statements.exists?
-        [issn, (series_statements.map{|s| s.manifestation.issn})].flatten.uniq.compact
+        [identifier_contents(:issn), (series_statements.map{|s| s.manifestation.identifier_contents(:issn)})].flatten.uniq.compact
       else
-        issn
+        identifier_contents(:issn)
       end
     end
     string :sort_title
@@ -223,75 +230,22 @@ class Manifestation < ActiveRecord::Base
   validates_associated :carrier_type, :language
   validates :start_page, :numericality => true, :allow_blank => true
   validates :end_page, :numericality => true, :allow_blank => true
-  validates :isbn, :uniqueness => true, :allow_blank => true, :unless => proc{|manifestation| manifestation.series_statements.exists?}
-  validates :nbn, :uniqueness => true, :allow_blank => true
   validates :manifestation_identifier, :uniqueness => true, :allow_blank => true
   validates :pub_date, :format => {:with => /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, :allow_blank => true
   validates :access_address, :url => true, :allow_blank => true, :length => {:maximum => 255}
-  validate :check_isbn, :check_issn, :check_lccn, :unless => :during_import
   validates :issue_number, :numericality => {:greater_than => 0}, :allow_blank => true
   validates :volume_number, :numericality => {:greater_than => 0}, :allow_blank => true
   validates :serial_number, :numericality => {:greater_than => 0}, :allow_blank => true
   validates :edition, :numericality => {:greater_than => 0}, :allow_blank => true
-  before_validation :set_wrong_isbn, :check_issn, :check_lccn, :if => :during_import
-  before_validation :convert_isbn, :if => :isbn_changed?
   after_create :clear_cached_numdocs
   before_save :set_date_of_publication, :set_number
   after_save :index_series_statement
   after_destroy :index_series_statement
-  normalize_attributes :manifestation_identifier, :pub_date, :isbn, :issn, :nbn, :lccn, :original_title
+  normalize_attributes :manifestation_identifier, :pub_date, :original_title
   paginates_per 10
 
   attr_accessor :during_import, :parent_id
 
-  def check_isbn
-    if isbn.present?
-      unless StdNum::ISBN.valid?(isbn)
-        errors.add(:isbn)
-      end
-    end
-  end
-
-  def check_issn
-    self.issn = StdNum::ISSN.normalize(issn)
-    if issn.present?
-      unless StdNum::ISSN.valid?(issn)
-        errors.add(:issn)
-      end
-    end
-  end
-
-  def check_lccn
-    if lccn.present?
-      unless StdNum::LCCN.valid?(lccn)
-        errors.add(:lccn)
-      end
-    end
-  end
-
-  def set_wrong_isbn
-    if isbn.present?
-      unless StdNum::ISBN.valid?(isbn)
-        self.wrong_isbn
-        self.isbn = nil
-      end
-    end
-  end
-
-  def convert_isbn
-    return nil unless isbn
-    lisbn = Lisbn.new(isbn)
-    if lisbn.isbn
-      if lisbn.isbn.length == 10
-        self.isbn10 = lisbn.isbn10
-        self.isbn = lisbn.isbn13
-      elsif lisbn.isbn.length == 13
-        self.isbn = lisbn.isbn10
-        self.isbn = lisbn.isbn13
-      end
-    end
-  end
-
   def set_date_of_publication
     return if pub_date.blank?
     begin
@@ -379,11 +333,6 @@ class Manifestation < ActiveRecord::Base
     titles
   end
 
-  def hyphenated_isbn
-    lisbn = Lisbn.new(isbn)
-    lisbn.parts.join('-')
-  end
-
   # TODO: よりよい推薦方法
   def self.pickup(keyword = nil)
     return nil if self.cached_numdocs < 5
@@ -434,10 +383,9 @@ class Manifestation < ActiveRecord::Base
   end
 
   def self.find_by_isbn(isbn)
-    lisbn = Lisbn.new(isbn.to_s)
-    if lisbn.valid?
-      Manifestation.where(:isbn => lisbn.isbn13).first || Manifestation.where(:isbn => lisbn.isbn10).first
-    end
+    identifier_type = IdentifierType.where(:name => 'isbn').first
+    return nil unless identifier_type
+    Manifestation.includes(:identifiers => :identifier_type).where(:"identifiers.body" => isbn, :"identifier_types.name" => 'isbn')
   end
 
   def index_series_statement
@@ -513,12 +461,6 @@ class Manifestation < ActiveRecord::Base
     }.compact
   end
 
-  def self.import_isbn(isbn)
-    manifestation = Manifestation.import_from_ndl_search(:isbn => isbn) if defined?(EnjuNdl)
-    #manifestation = Manifestation.import_from_cinii_books(:isbn => isbn) if defined?(EnjuNii)
-    manifestation
-  end
-
   def latest_issue
     if series_master?
       derived_manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
@@ -530,6 +472,12 @@ class Manifestation < ActiveRecord::Base
       derived_manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
     end
   end
+
+  def identifier_contents(name)
+    if IdentifierType.where(:name => name.to_s).exists?
+      identifiers.where(:identifier_type_id => IdentifierType.where(:name => name).first.id).pluck(:body)
+    end
+  end
 end
 
 # == Schema Information
@@ -556,13 +504,6 @@ end
 #  height                          :integer
 #  width                           :integer
 #  depth                           :integer
-#  isbn                            :string(255)
-#  isbn10                          :string(255)
-#  wrong_isbn                      :string(255)
-#  nbn                             :string(255)
-#  lccn                            :string(255)
-#  oclc_number                     :string(255)
-#  issn                            :string(255)
 #  price                           :integer
 #  fulltext                        :text
 #  volume_number_string            :string(255)

data/app/models/page_sweeper.rb

@@ -23,8 +23,6 @@ class PageSweeper < ActionController::Caching::Sweeper
       expire_editable_fragment(record.item)
     when :SeriesStatement
       expire_editable_fragment(record.manifestation)
-    when :SeriesHasManifestation
-      expire_editable_fragment(record.manifestation)
     when :PictureFile
       if record.picture_attachable_type?
         expire_editable_fragment(record.picture_attachable)

data/app/models/resource_import_file.rb

@@ -91,21 +91,24 @@ class ResourceImportFile < ActiveRecord::Base
         manifestation = Manifestation.where(:manifestation_identifier => row['manifestation_identifier'].to_s.strip).first
       end
 
-      if row['nbn'].present?
-        manifestation = Manifestation.where(:nbn => row['nbn'].to_s.strip).first
-      end
-
       unless manifestation
         if row['doi'].present?
           doi = URI.parse(row['doi']).path.gsub(/^\//, "")
-          manifestation = Manifestation.where(:doi => doi).first if doi.present?
+          manifestation = Manifestation.where(:doi => doi).first
+        end
+      end
+
+      unless manifestation
+        if row['nbn'].present?
+          nbn = row['nbn'].to_s.strip
+          manifestation = Identifier.where(:body => 'nbn', :identifier_type_id => IdentifierType.where(:name => 'nbn').first_or_create.id).first.try(:manifestation)
         end
       end
 
       unless manifestation
         if row['isbn'].present?
           isbn = StdNum::ISBN.normalize(row['isbn'])
-          m = Manifestation.find_by_isbn(isbn)
+          m = Identifier.where(:body => isbn, :identifier_type_id => IdentifierType.where(:name => 'isbn').first_or_create.id).first.try(:manifestation)
         end
         if m
           if m.series_statements.exists?
@@ -393,11 +396,10 @@ class ResourceImportFile < ActiveRecord::Base
   def import_subject(row)
     subjects = []
     row['subject'].to_s.split('//').each do |s|
-      subject = Subject.where(:term => s.to_s.strip).first
-      unless subject
-        # TODO: Subject typeの設定
-        subject = Subject.create(:term => s.to_s.strip, :subject_type_id => 1)
-      end
+      # 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
     subjects
@@ -476,6 +478,20 @@ class ResourceImportFile < ActiveRecord::Base
     
     carrier_type = CarrierType.where(:name => row['carrier_type'].to_s.strip).first
 
+    identifier = {}
+    if row['isbn']
+      identifier[:isbn] = Identifier.new(:body => row['isbn'])
+      identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
+    end
+    if row['nbn']
+      identifier[:nbn] = Identifier.new(:body => row['nbn'])
+      identifier[:nbn].identifier_type = IdentifierType.where(:name => 'nbn').first_or_create
+    end
+    if row['issn']
+      identifier[:issn] = Identifier.new(:body => row['issn'])
+      identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn').first_or_create
+    end
+
     if end_page >= 1
       start_page = 1
     else
@@ -531,12 +547,6 @@ class ResourceImportFile < ActiveRecord::Base
         :title_transcription => title[:title_transcription],
         :title_alternative => title[:title_alternative],
         :title_alternative_transcription => title[:title_alternative_transcription],
-        :isbn => isbn,
-        :wrong_isbn => row['wrong_isbn'],
-        :issn => row['issn'],
-        :lccn => row['lccn'],
-        :nbn => row['nbn'],
-        :ndc => row['ndc'],
         :pub_date => row['pub_date'],
         :volume_number_string => row['volume_number_string'].to_s.split('　').first.try(:tr, '０-９', '0-9'),
         :issue_number_string => row['issue_number_string'],
@@ -553,7 +563,6 @@ class ResourceImportFile < ActiveRecord::Base
         :start_page => start_page,
         :end_page => end_page,
         :access_address => row['access_address'],
-        :doi => row['doi'],
         :manifestation_identifier => row['manifestation_identifier'],
         :fulltext_content => fulltext_content
       }.delete_if{|key, value| value.nil?}
@@ -578,6 +587,13 @@ class ResourceImportFile < ActiveRecord::Base
 
       manifestation.carrier_type = carrier_type if carrier_type
 
+      Manifestation.transaction do
+        manifestation.identifiers.delete_all if manifestation.identifiers.exists?
+        identifier.each do |k, v|
+          manifestation.identifiers << v if v.valid?
+        end
+      end
+
       if row['series_original_title'].to_s.strip.present?
         Manifestation.transaction do
           if manifestation.series_statements.exists?

data/app/views/addresses/_form.html.erb

@@ -0,0 +1,57 @@
+<%= form_for(@address) do |f| %>
+  <% if @address.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@address.errors.count, "error") %> prohibited this address from being saved:</h2>
+
+      <ul>
+      <% @address.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :patron_id %><br />
+    <%= f.number_field :patron_id %>
+  </div>
+  <div class="field">
+    <%= f.label :place %><br />
+    <%= f.text_area :place %>
+  </div>
+  <div class="field">
+    <%= f.label :street %><br />
+    <%= f.text_area :street %>
+  </div>
+  <div class="field">
+    <%= f.label :locality %><br />
+    <%= f.text_area :locality %>
+  </div>
+  <div class="field">
+    <%= f.label :region %><br />
+    <%= f.text_area :region %>
+  </div>
+  <div class="field">
+    <%= f.label :zip_code %><br />
+    <%= f.text_field :zip_code %>
+  </div>
+  <div class="field">
+    <%= f.label :country_id %><br />
+    <%= f.number_field :country_id %>
+  </div>
+  <div class="field">
+    <%= f.label :telephone_number %><br />
+    <%= f.text_field :telephone_number %>
+  </div>
+  <div class="field">
+    <%= f.label :fax_number %><br />
+    <%= f.text_field :fax_number %>
+  </div>
+  <div class="field">
+    <%= f.label :note %><br />
+    <%= f.text_area :note %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/addresses/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing address</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @address %> |
+<%= link_to 'Back', addresses_path %>

data/app/views/addresses/index.html.erb

@@ -0,0 +1,41 @@
+<h1>Listing addresses</h1>
+
+<table>
+  <tr>
+    <th>Patron</th>
+    <th>Place</th>
+    <th>Street</th>
+    <th>Locality</th>
+    <th>Region</th>
+    <th>Zip code</th>
+    <th>Country</th>
+    <th>Telephone number</th>
+    <th>Fax number</th>
+    <th>Note</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @addresses.each do |address| %>
+  <tr>
+    <td><%= address.patron_id %></td>
+    <td><%= address.place %></td>
+    <td><%= address.street %></td>
+    <td><%= address.locality %></td>
+    <td><%= address.region %></td>
+    <td><%= address.zip_code %></td>
+    <td><%= address.country_id %></td>
+    <td><%= address.telephone_number %></td>
+    <td><%= address.fax_number %></td>
+    <td><%= address.note %></td>
+    <td><%= link_to 'Show', address %></td>
+    <td><%= link_to 'Edit', edit_address_path(address) %></td>
+    <td><%= link_to 'Destroy', address, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Address', new_address_path %>