enju_biblio 0.1.0.pre26 → 0.1.0.pre27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c13e2a38d5c6944c5ed3a848a94409d27c2e7ab3
-  data.tar.gz: fc303a17573c7c188a1a305ea929f0fe0f553cc6
+  metadata.gz: da68fdc2b1c9195ad09836bb28ff9bb5d17d1bb7
+  data.tar.gz: 7eb5c072062cee021ddfe18dd7a76b6cdba2df81
 SHA512:
-  metadata.gz: 8b0b4215ba1bf4a50dc52dce7c171f8948ffb060db270db63d7717c9de43fc8811bb1ede2b594715d4daa4a5aca1e422220adc38ca2db75dd5ba95ec8fd2bbab
-  data.tar.gz: f4a4891b39e3ebc5204c9f66fdf0e60a5e5f06a04dd94262f2ffef273dc37cfd252950eb07cf200ce7ff810de0e7be864ec348dea8f0e1ad654a6f7bf4b09f16
+  metadata.gz: 8885a54bf46d238975fe9e98e8d0f55d6a4ba46113b2a1d46ce878ebc280bc22861d66a3cba64d4ebf60d4780343af2f3488a93f2e3bb67b28fee18c381ca36d
+  data.tar.gz: 11fa3268b7618c6c52e4d4cf7c6eecb3d5f202b00c2fa366f82bf3e4d525cf7a6678ced09949644850d7c2eae59fe9c9c20613d4313d669c664b4bc338c02462

data/app/controllers/manifestations_controller.rb

@@ -476,12 +476,11 @@ class ManifestationsController < ApplicationController
     end
 
     respond_to do |format|
+      set_patrons
       if @manifestation.save
         Sunspot.commit
-        Manifestation.transaction do
-          if @original_manifestation
-            @manifestation.derived_manifestations << @original_manifestation
-          end
+        if @original_manifestation
+          @manifestation.derived_manifestations << @original_manifestation
         end
 
         format.html { redirect_to @manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.manifestation')) }
@@ -498,6 +497,7 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1.json
   def update
     respond_to do |format|
+      set_patrons
       if @manifestation.update_attributes(params[:manifestation])
         Sunspot.commit
         format.html { redirect_to @manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.manifestation')) }
@@ -773,4 +773,10 @@ class ManifestationsController < ApplicationController
       @manifestation.title_transcription = @original_manifestation.title_transcription
     end
   end
+
+  def set_patrons
+    @manifestation.set_creators(@manifestation.creators)
+    @manifestation.set_contributors(@manifestation.contributors)
+    @manifestation.set_publishers(@manifestation.publishers)
+  end
 end

data/app/models/manifestation.rb

@@ -10,7 +10,8 @@ class Manifestation < ActiveRecord::Base
     :valid_until, :date_submitted, :date_accepted, :date_captured, :ndl_bib_id,
     :pub_date, :edition_string, :volume_number, :issue_number, :serial_number,
     :ndc, :content_type_id, :attachment, :classification_number,
-    :series_has_manifestation_attributes
+    :series_has_manifestation_attributes,
+    :creators_attributes, :contributors_attributes, :publishers_attributes
   attr_accessible :fulltext_content,
     :doi, :number_of_page_string
 
@@ -39,6 +40,9 @@ class Manifestation < ActiveRecord::Base
   has_one :resource_import_result
   belongs_to :nii_type if defined?(EnjuNii)
   accepts_nested_attributes_for :series_has_manifestation
+  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
 
   searchable do
     text :title, :default_boost => 2 do
@@ -229,7 +233,7 @@ class Manifestation < ActiveRecord::Base
   normalize_attributes :manifestation_identifier, :pub_date, :isbn, :issn, :nbn, :lccn, :original_title
   paginates_per 10
 
-  attr_accessor :during_import
+  attr_accessor :during_import, :creator_string
 
   def check_isbn
     if isbn.present?
@@ -525,6 +529,18 @@ class Manifestation < ActiveRecord::Base
     }.compact
   end
 
+  def set_creators(creators = [])
+    self.creators = set_patrons(creators)
+  end
+
+  def set_contributors(contributors = [])
+    self.contributors = set_patrons(contributors)
+  end
+
+  def set_publishers(publishers = [])
+    self.publishers = set_patrons(publishers)
+  end
+
   if defined?(EnjuScribd)
     attr_accessible :post_to_scribd
   end
@@ -561,6 +577,18 @@ class Manifestation < ActiveRecord::Base
     end
     self
   end
+
+  def set_patrons(patrons)
+    new_patrons = []
+    patrons.each do |patron|
+      if patron.full_name.present?
+        new_patron = Patron.where(:full_name => patron.full_name).first
+        new_patron = Patron.create(:full_name => patron.full_name) unless new_patron
+      end
+      new_patrons << new_patron if new_patron
+    end
+    new_patrons
+  end
 end
 
 # == Schema Information

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

@@ -1,5 +1,5 @@
 <%= render 'page/required_field' %>
-<%= simple_form_for(@manifestation, :html => { :multipart => true }) do |f| -%>
+<%= simple_nested_form_for(@manifestation, :html => { :multipart => true }) do |f| -%>
   <%= f.error_messages -%>
 
   <div class="field">
@@ -39,6 +39,33 @@
     <%= f.text_field :title_alternative, :class => 'resource_title' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :creator_string -%><br />
+    <%= f.fields_for :creators do |creator_form| %>
+      <%= creator_form.text_field :full_name %>
+      <%= creator_form.link_to_remove t('page.remove') %>
+    <% end %>
+    <p><%= f.link_to_add t('page.add'), :creators %></p>
+  </div>
+
+  <div class="field">
+    <%= f.label :contributor_string -%><br />
+    <%= f.fields_for :contributors do |contributor_form| %>
+      <%= contributor_form.text_field :full_name %>
+      <%= contributor_form.link_to_remove t('page.remove') %>
+    <% end %>
+    <p><%= f.link_to_add t('page.add'), :contributors %></p>
+  </div>
+
+  <div class="field">
+    <%= f.label :publisher_string -%><br />
+    <%= f.fields_for :publishers do |publisher_form| %>
+      <%= publisher_form.text_field :full_name %>
+      <%= publisher_form.link_to_remove t('page.remove') %>
+    <% end %>
+    <p><%= f.link_to_add t('page.add'), :publishers %></p>
+  </div>
+
   <%- if @series_statement.try(:periodical?) -%>
     <%= render :partial => 'manifestations/serial_form', :locals => {:f => f, :manifestation => @manifestation} -%>
   <%- else -%>

data/config/locales/translation_en.yml

@@ -76,6 +76,9 @@ en:
         issn: ISSN
         subscription_master: Subscription master
         description: Description
+        creator_string: Creator
+        contributor_string: Contributor
+        publisher_string: Publisher
       item:
         call_number: Call number
         item_identifier: Item identifier
@@ -284,3 +287,12 @@ en:
 
   resource_import_file:
     update_relationship: Update relationship
+ 
+  patron:
+    creator: Creator
+    contributor: Contributor
+    publisher: Publisher
+
+  page:
+    add: Add
+    remove: Remove

data/config/locales/translation_ja.yml

@@ -2,7 +2,7 @@ ja:
   activerecord:
     models:
       carrier_type: 資料の形態
-      content_type: 協力した資料の形態
+      content_type: 資料の内容の形態
       create: 著作関係
       create_type: 著作の関係
       embody: 具体化
@@ -76,6 +76,9 @@ ja:
         issn: ISSN
         subscription_master: 購読マスタ
         description: 説明
+        creator_string: 著者
+        contributor_string: 協力者・編者
+        publisher_string: 出版者
       item:
         call_number: 請求記号
         item_identifier: 所蔵情報ID
@@ -284,3 +287,12 @@ ja:
 
   resource_import_file:
     update_relationship: 関連を更新
+
+  patron:
+    creator: 著者
+    contributor: 協力者・編者
+    publisher: 出版社
+
+  page:
+    add: 追加
+    remove: 削除

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre26"
+  VERSION = "0.1.0.pre27"
 end

data/spec/dummy/solr/data/test/index/_34u.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm

data/spec/dummy/solr/data/test/index/_34u.nrm

@@ -0,0 +1 @@
+NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpt||||��|||||��||||||||||||||||||||||||||||||||||||||tu|||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/_34v.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm

data/spec/dummy/solr/data/test/index/_34v.nrm

@@ -0,0 +1 @@
+NRM�xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/_34w.fnm

@@ -0,0 +1,8 @@
+����3idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+library_sm
+language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
+end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
+creator_smsort_title_speriodical_bperiodical_master_breservable_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dmissn_sm	issn_text
volume_number_iissue_number_iserial_number_iatitle_text
date_of_publication_d
+pub_year_i

data/spec/dummy/solr/data/test/index/_34w.nrm

@@ -0,0 +1 @@
+NRM�vruwvvuur|xutttttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|xu||tttwwuuuuuuxx|||||y|||��|||||||���������||||||||||||xw|||||||||||||||||||||||||y||||||||||||||||||||||||||tt|||||||||||||

data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1365440076.772817:@value"
+i


metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre26
+  version: 0.1.0.pre27
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: enju_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc2
+        version: 0.1.1.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc2
+        version: 0.1.1.pre4
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: enju_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre3
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +296,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre14
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -338,14 +324,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre8
+        version: 0.1.2.pre9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre8
+        version: 0.1.2.pre9
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -394,28 +380,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre2
+        version: 0.1.1.pre3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre2
+        version: 0.1.1.pre3
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre15
+        version: 0.1.0.pre16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre15
+        version: 0.1.0.pre16
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
@@ -1128,12 +1114,38 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_34u.fdt
+- spec/dummy/solr/data/test/index/_34u.fdx
+- spec/dummy/solr/data/test/index/_34u.fnm
+- spec/dummy/solr/data/test/index/_34u.frq
+- spec/dummy/solr/data/test/index/_34u.nrm
+- spec/dummy/solr/data/test/index/_34u.prx
+- spec/dummy/solr/data/test/index/_34u.tii
+- spec/dummy/solr/data/test/index/_34u.tis
+- spec/dummy/solr/data/test/index/_34v.fdt
+- spec/dummy/solr/data/test/index/_34v.fdx
+- spec/dummy/solr/data/test/index/_34v.fnm
+- spec/dummy/solr/data/test/index/_34v.frq
+- spec/dummy/solr/data/test/index/_34v.nrm
+- spec/dummy/solr/data/test/index/_34v.prx
+- spec/dummy/solr/data/test/index/_34v.tii
+- spec/dummy/solr/data/test/index/_34v.tis
+- spec/dummy/solr/data/test/index/_34w.fdt
+- spec/dummy/solr/data/test/index/_34w.fdx
+- spec/dummy/solr/data/test/index/_34w.fnm
+- spec/dummy/solr/data/test/index/_34w.frq
+- spec/dummy/solr/data/test/index/_34w.nrm
+- spec/dummy/solr/data/test/index/_34w.prx
+- spec/dummy/solr/data/test/index/_34w.tii
+- spec/dummy/solr/data/test/index/_34w.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_46s
+- spec/dummy/solr/data/test/index/segments_4hr
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
+- spec/dummy/tmp/cache/4AD/470/country_all
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
+- spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb
@@ -1561,12 +1573,38 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_34u.fdt
+- spec/dummy/solr/data/test/index/_34u.fdx
+- spec/dummy/solr/data/test/index/_34u.fnm
+- spec/dummy/solr/data/test/index/_34u.frq
+- spec/dummy/solr/data/test/index/_34u.nrm
+- spec/dummy/solr/data/test/index/_34u.prx
+- spec/dummy/solr/data/test/index/_34u.tii
+- spec/dummy/solr/data/test/index/_34u.tis
+- spec/dummy/solr/data/test/index/_34v.fdt
+- spec/dummy/solr/data/test/index/_34v.fdx
+- spec/dummy/solr/data/test/index/_34v.fnm
+- spec/dummy/solr/data/test/index/_34v.frq
+- spec/dummy/solr/data/test/index/_34v.nrm
+- spec/dummy/solr/data/test/index/_34v.prx
+- spec/dummy/solr/data/test/index/_34v.tii
+- spec/dummy/solr/data/test/index/_34v.tis
+- spec/dummy/solr/data/test/index/_34w.fdt
+- spec/dummy/solr/data/test/index/_34w.fdx
+- spec/dummy/solr/data/test/index/_34w.fnm
+- spec/dummy/solr/data/test/index/_34w.frq
+- spec/dummy/solr/data/test/index/_34w.nrm
+- spec/dummy/solr/data/test/index/_34w.prx
+- spec/dummy/solr/data/test/index/_34w.tii
+- spec/dummy/solr/data/test/index/_34w.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_46s
+- spec/dummy/solr/data/test/index/segments_4hr
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
+- spec/dummy/tmp/cache/4AD/470/country_all
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
+- spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb