enju_biblio 0.3.10.rc.1 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d5c642a35ec134208140ee6fbf038219d633619ba7a4a50927bcd14522e685
-  data.tar.gz: 814c6c8c7c795efa2cc55365805e1bbee2d7689d730593c56f00d012a7d4fa52
+  metadata.gz: 13bb317c73b54a9d6ff4bc74db706b224929d3474f1de724d53abd0a3c075e12
+  data.tar.gz: 3fc674acbf36775a9394609f1a3108230c94e62455fdf257371571b58d330990
 SHA512:
-  metadata.gz: 969d8e56c2adfdc2b82b63bf193d28092348c7cb01675cc19e59e936e9ab73ab9878f8403a82397420c3f9469d37bbbcdf610f3d465980c6d5607d9219be510b
-  data.tar.gz: be66e593d2fd98df02e694169b53554aadd7a9d3369e731a96eede7bd3ef7336a48372025d55a4de462156d8d6018c4ee5b02954b49676f0d9a20cd90e161c96
+  metadata.gz: bad673e2ff6572eee73c8ba3314c28895876e41e86e24545f7c8dd090d059544f01c280bb4e0c9cd668d4daa19db04c03771a6b6ddc9d0d385ad42162bf8f51d
+  data.tar.gz: cc53497b07c0d9fea3e1186b9be7e401e47aabb4b32df2087b949e5b95eabb270a0cc056fefc7aea7f65edc31b1f7f02662e1403f1c6704bcad5e1b40eaf3f4f

data/app/controllers/item_custom_properties_controller.rb

@@ -25,7 +25,7 @@ class ItemCustomPropertiesController < ApplicationController
     @item_custom_property = ItemCustomProperty.new(item_custom_property_params)
 
     if @item_custom_property.save
-      redirect_to @item_custom_property, notice: 'Item custom property was successfully created.'
+      redirect_to @item_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.item_custom_property'))
     else
       render :new
     end
@@ -33,8 +33,13 @@ class ItemCustomPropertiesController < ApplicationController
 
   # PATCH/PUT /item_custom_properties/1
   def update
+    if params[:move]
+      move_position(@item_custom_property, params[:move])
+      return
+    end
+
     if @item_custom_property.update(item_custom_property_params)
-      redirect_to @item_custom_property, notice: 'Item custom property was successfully updated.'
+      redirect_to @item_custom_property, notice: t('controller.successfully_updated', model: t('activerecord.models.item_custom_property'))
     else
       render :edit
     end
@@ -43,7 +48,7 @@ class ItemCustomPropertiesController < ApplicationController
   # DELETE /item_custom_properties/1
   def destroy
     @item_custom_property.destroy
-    redirect_to item_custom_properties_url, notice: 'Item custom property was successfully destroyed.'
+    redirect_to item_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.item_custom_property'))
   end
 
   private

data/app/controllers/items_controller.rb

@@ -51,6 +51,17 @@ class ItemsController < ApplicationController
 
     unless @inventory_file
       search = Sunspot.new_search(Item)
+      selected_attributes = [
+        :id, :item_identifier, :call_number, :manifestation_id, :acquired_at,
+        :binding_item_identifier, :binding_call_number, :binded_at,
+        :include_supplements, :url, :note,
+        :circulation_status_id, :shelf_id,
+        :created_at, :updated_at
+      ]
+      selected_attributes += [
+        :memo, :required_role_id, :budget_type_id, :bookstore_id, :price
+      ] if current_user.try(:has_role?, 'Librarian')
+      search.data_accessor_for(Item).select = selected_attributes
       set_role_query(current_user, search)
 
       @query = query.dup
@@ -122,7 +133,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @items }
+      format.json
       format.txt  { render layout: false }
       format.atom
     end
@@ -137,7 +148,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @item }
+      format.json
     end
   end
 

data/app/controllers/manifestation_custom_properties_controller.rb

@@ -25,7 +25,7 @@ class ManifestationCustomPropertiesController < ApplicationController
     @manifestation_custom_property = ManifestationCustomProperty.new(manifestation_custom_property_params)
 
     if @manifestation_custom_property.save
-      redirect_to @manifestation_custom_property, notice: 'Manifestation custom property was successfully created.'
+      redirect_to @manifestation_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_custom_property'))
     else
       render :new
     end
@@ -33,8 +33,13 @@ class ManifestationCustomPropertiesController < ApplicationController
 
   # PATCH/PUT /manifestation_custom_properties/1
   def update
+    if params[:move]
+      move_position(@manifestation_custom_property, params[:move])
+      return
+    end
+
     if @manifestation_custom_property.update(manifestation_custom_property_params)
-      redirect_to @manifestation_custom_property, notice: 'Manifestation custom property was successfully updated.'
+      redirect_to @manifestation_custom_property, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_custom_property'))
     else
       render :edit
     end
@@ -43,7 +48,7 @@ class ManifestationCustomPropertiesController < ApplicationController
   # DELETE /manifestation_custom_properties/1
   def destroy
     @manifestation_custom_property.destroy
-    redirect_to manifestation_custom_properties_url, notice: 'Manifestation custom property was successfully destroyed.'
+    redirect_to manifestation_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.manifestation_custom_property'))
   end
 
   private

data/app/controllers/manifestations_controller.rb

@@ -33,25 +33,14 @@ class ManifestationsController < ApplicationController
         per_page = 65534
       end
 
-      if params[:format] == 'sru'
-        if params[:operation] == 'searchRetrieve'
-          sru = Sru.new(params)
-          query = sru.cql.to_sunspot
-          sort = sru.sort_by
-        else
-          render template: 'manifestations/explain', layout: false
-          return
-        end
+      if params[:api] == 'openurl'
+        openurl = Openurl.new(params)
+        @manifestations = openurl.search
+        query = openurl.query_text
+        sort = set_search_result_order(params[:sort_by], params[:order])
       else
-        if params[:api] == 'openurl'
-          openurl = Openurl.new(params)
-          @manifestations = openurl.search
-          query = openurl.query_text
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        else
-          query = make_query(params[:query], params)
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        end
+        query = make_query(params[:query], params)
+        sort = set_search_result_order(params[:sort_by], params[:order])
       end
 
       # 絞り込みを行わない状態のクエリ
@@ -191,37 +180,37 @@ class ManifestationsController < ApplicationController
       else
         per_page = Manifestation.default_per_page
       end
-      if params[:format] == 'sru'
-        #search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
+
+      pub_dates = parse_pub_date(params)
+      pub_date_range = {}
+
+      if pub_dates[:from] == '*'
+        pub_date_range[:from] = 0
       else
-        pub_dates = parse_pub_date(params)
-        pub_date_range = {}
-        if pub_dates[:from] == '*'
-          pub_date_range[:from] = 0
-        else
-          pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
-        end
-        if pub_dates[:until] == '*'
-          pub_date_range[:until] = 10000
-        else
-          pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
-        end
-        if params[:pub_year_range_interval]
-          pub_year_range_interval = params[:pub_year_range_interval].to_i
-        else
-          pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
-        end
+        pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
+      end
+      if pub_dates[:until] == '*'
+        pub_date_range[:until] = 10000
+      else
+        pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
+      end
 
-        search.build do
-          facet :reservable if defined?(EnjuCirculation)
-          facet :carrier_type
-          facet :library
-          facet :language
-          facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
-          facet :subject_ids if defined?(EnjuSubject)
-          paginate page: page.to_i, per_page: per_page
-        end
+      if params[:pub_year_range_interval]
+        pub_year_range_interval = params[:pub_year_range_interval].to_i
+      else
+        pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
+      end
+
+      search.build do
+        facet :reservable if defined?(EnjuCirculation)
+        facet :carrier_type
+        facet :library
+        facet :language
+        facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
+        facet :subject_ids if defined?(EnjuSubject)
+        paginate page: page.to_i, per_page: per_page
       end
+
       search_result = search.execute
       if @count[:query_result] > @max_number_of_results
         max_count = @max_number_of_results
@@ -261,7 +250,6 @@ class ManifestationsController < ApplicationController
       format.html
       format.html.phone
       format.xml  { render xml: @manifestations }
-      format.sru  { render layout: false }
       format.rss  { render layout: false }
       format.txt  { render layout: false }
       format.rdf  { render layout: false }
@@ -332,7 +320,7 @@ class ManifestationsController < ApplicationController
       }
       format.rdf
       format.mods
-      format.json { render json: @manifestation }
+      format.json
       format.txt
       format.js
       format.download {

data/app/models/item.rb

@@ -107,10 +107,11 @@ class Item < ApplicationRecord
     record = {
       item_id: id,
       item_identifier: item_identifier,
+      binding_item_identifier: binding_item_identifier,
       call_number: call_number,
-      shelf: shelf.name,
+      shelf: shelf&.name,
       item_note: note,
-      accepted_at: accept.try(:created_at),
+      accepted_at: accept&.created_at,
       acquired_at: acquired_at,
       item_created_at: created_at,
       item_updated_at: updated_at
@@ -118,8 +119,9 @@ class Item < ApplicationRecord
 
     if ['Administrator', 'Librarian'].include?(role)
       record.merge!({
-        bookstore: bookstore.try(:name),
-        budget_type: budget_type.try(:name),
+        bookstore: bookstore&.name,
+        budget_type: budget_type&.name,
+        item_required_role: required_role.name,
         item_price: price,
         memo: memo
       })
@@ -131,7 +133,9 @@ class Item < ApplicationRecord
 
       if defined?(EnjuCirculation)
         record.merge!({
-          use_restriction: use_restriction.try(:name),
+          use_restriction: use_restriction&.name,
+          circulation_status: circulation_status&.name,
+          checkout_type: checkout_type&.name,
           total_checkouts: checkouts.count
         })
       end

data/app/models/item_custom_property.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: item_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/item_custom_value.rb

@@ -8,9 +8,9 @@ end
 #
 # Table name: item_custom_values
 #
-#  id                      :bigint           not null, primary key
-#  item_custom_property_id :bigint           not null
-#  item_id                 :bigint           not null
+#  id                      :integer          not null, primary key
+#  item_custom_property_id :integer          not null
+#  item_id                 :integer          not null
 #  value                   :text
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null

data/app/models/manifestation.rb

@@ -96,7 +96,7 @@ class Manifestation < ApplicationRecord
       end
     end
     string :language do
-      language.try(:name)
+      language&.name
     end
     string :item_identifier, multiple: true do
       if series_master?
@@ -120,7 +120,7 @@ class Manifestation < ApplicationRecord
     end
     time :date_of_publication
     integer :pub_year do
-      date_of_publication.try(:year)
+      date_of_publication&.year
     end
     integer :creator_ids, multiple: true
     integer :contributor_ids, multiple: true
@@ -357,7 +357,7 @@ class Manifestation < ApplicationRecord
   # TODO: よりよい推薦方法
   def self.pickup(keyword = nil, current_user = nil)
     return nil if self.cached_numdocs < 5
-    if current_user.try(:role)
+    if current_user&.role
       current_role_id = current_user.role.id
     else
       current_role_id = 1
@@ -433,7 +433,7 @@ class Manifestation < ApplicationRecord
   end
 
   def index_series_statement
-    series_statements.map{|s| s.index; s.root_manifestation.try(:index)}
+    series_statements.map{|s| s.index; s.root_manifestation&.index}
   end
 
   def acquired_at
@@ -541,16 +541,34 @@ class Manifestation < ApplicationRecord
   def to_hash(role: 'Guest')
     record = {
       manifestation_id: id,
-      title: original_title,
+      original_title: original_title,
       title_alternative: title_alternative,
       title_transcription: title_transcription,
       statement_of_responsibility: statement_of_responsibility,
       serial: serial,
       manifestation_identifier: manifestation_identifier,
-      creator: creators.pluck(:full_name).join('//'),
-      contributor: contributors.pluck(:full_name).join('//'),
-      publisher: publishers.pluck(:full_name).join('//'),
-      date_of_publication: date_of_publication,
+      creator: creates.map{|create|
+        if create.create_type
+          "#{create.agent.full_name}||#{create.create_type.name}"
+        else
+          "#{create.agent.full_name}"
+        end
+      }.join('//'),
+      contributor: realizes.map{|realize|
+        if realize.realize_type
+          "#{realize.agent.full_name}||#{realize.realize_type.name}"
+        else
+          "#{realize.agent.full_name}"
+        end
+      }.join('//'),
+      publisher: produces.map{|produce|
+        if produce.produce_type
+          "#{produce.agent.full_name}||#{produce.produce_type.name}"
+        else
+          "#{produce.agent.full_name}"
+        end
+      }.join('//'),
+      pub_date: date_of_publication,
       year_of_publication: year_of_publication,
       publication_place: publication_place,
       manifestation_created_at: created_at,
@@ -577,13 +595,13 @@ class Manifestation < ApplicationRecord
       depth: depth,
       price: price,
       access_address: access_address,
-      required_role: required_role.name,
+      manifestation_required_role: required_role.name,
       description: description,
       note: note
     }
 
     IdentifierType.find_each do |type|
-      record[type.name.to_sym] = identifiers.where(identifier_type: type).pluck(:body).join('//')
+      record[:"identifier:#{type.name.to_sym}"] = identifiers.where(identifier_type: type).pluck(:body).join('//')
     end
 
     series = series_statements.order(:position)
@@ -610,7 +628,7 @@ class Manifestation < ApplicationRecord
       })
       ManifestationCustomProperty.order(:position).each do |custom_property|
         custom_value = manifestation_custom_values.find_by(manifestation_custom_property: custom_property)
-        record[:"manifestation:#{custom_property.name}"] = custom_value.try(:value)
+        record[:"manifestation:#{custom_property.name}"] = custom_value&.value
       end
     end
 
@@ -623,6 +641,14 @@ class Manifestation < ApplicationRecord
       end
     end
 
+    if defined?(EnjuNdl)
+      record["jpno"] = identifier_contents(:jpno).first
+    end
+
+    if defined?(EnjuNii)
+      record["ncid"] = identifier_contents(:ncid).first
+    end
+
     record
   end
 

data/app/models/manifestation_custom_property.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: manifestation_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/manifestation_custom_value.rb

@@ -8,9 +8,9 @@ end
 #
 # Table name: manifestation_custom_values
 #
-#  id                               :bigint           not null, primary key
-#  manifestation_custom_property_id :bigint           not null
-#  manifestation_id                 :bigint           not null
+#  id                               :integer          not null, primary key
+#  manifestation_custom_property_id :integer          not null
+#  manifestation_id                 :integer          not null
 #  value                            :text
 #  created_at                       :datetime         not null
 #  updated_at                       :datetime         not null