enju_biblio 0.1.0.pre14 → 0.1.0.pre15

data/app/controllers/manifestations_controller.rb

@@ -230,11 +230,30 @@ class ManifestationsController < ApplicationController
       if params[:format] == 'sru'
         search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
       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[:to] == '*'
+          pub_date_range[:to] = 10000
+        else
+          pub_date_range[:to] = Time.zone.parse(pub_dates[:to]).year
+        end
+        if params[:pub_year_range_interval]
+          pub_year_range_interval = params[:pub_year_range_interval].to_i
+        else
+          pub_year_range_interval = Setting.manifestation.facet.pub_year_range_interval
+        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[:to], :range_interval => pub_year_range_interval
           facet :subject_ids if defined?(EnjuSubject)
           paginate :page => page.to_i, :per_page => per_page
         end
@@ -253,6 +272,7 @@ class ManifestationsController < ApplicationController
         @carrier_type_facet = search_result.facet(:carrier_type).rows
         @language_facet = search_result.facet(:language).rows
         @library_facet = search_result.facet(:library).rows
+        @pub_year_facet = search_result.facet(:pub_year).rows.reverse
       end
 
       @search_engines = Rails.cache.fetch('search_engine_all'){SearchEngine.all}
@@ -682,29 +702,33 @@ class ManifestationsController < ApplicationController
     end
   end
 
+  def parse_pub_date(options)
+    pub_date = {}
+    if options[:pub_date_from].blank?
+      pub_date[:from] = "*"
+    else
+      pub_date[:from] = Time.zone.parse(options[:pub_date_from]).beginning_of_day.utc.iso8601 rescue nil
+      unless pub_date[:from]
+        pub_date[:from] = Time.zone.parse(Time.mktime(options[:pub_date_from]).to_s).beginning_of_day.utc.iso8601
+      end
+    end
+
+    if options[:pub_date_to].blank?
+      pub_date[:to] = "*"
+    else
+      pub_date[:to] = Time.zone.parse(options[:pub_date_to]).end_of_day.utc.iso8601 rescue nil
+      unless pub_date[:to]
+        pub_date[:to] = Time.zone.parse(Time.mktime(options[:pub_date_to]).to_s).end_of_year.utc.iso8601
+      end
+    end
+    pub_date
+  end
+
   def set_pub_date(query, options)
     unless options[:pub_date_from].blank? and options[:pub_date_to].blank?
       options[:pub_date_from].to_s.gsub!(/\D/, '')
       options[:pub_date_to].to_s.gsub!(/\D/, '')
-
-      pub_date = {}
-      if options[:pub_date_from].blank?
-        pub_date[:from] = "*"
-      else
-        pub_date[:from] = Time.zone.parse(options[:pub_date_from]).beginning_of_day.utc.iso8601 rescue nil
-        unless pub_date[:from]
-          pub_date[:from] = Time.zone.parse(Time.mktime(options[:pub_date_from]).to_s).beginning_of_day.utc.iso8601
-        end
-      end
-
-      if options[:pub_date_to].blank?
-        pub_date[:to] = "*"
-      else
-        pub_date[:to] = Time.zone.parse(options[:pub_date_to]).end_of_day.utc.iso8601 rescue nil
-        unless pub_date[:to]
-          pub_date[:to] = Time.zone.parse(Time.mktime(options[:pub_date_to]).to_s).end_of_year.utc.iso8601
-        end
-      end
+      pub_date = parse_pub_date(options)
       query = "#{query} date_of_publication_d:[#{pub_date[:from]} TO #{pub_date[:to]}]"
     end
     query

data/app/helpers/manifestations_helper.rb

@@ -108,6 +108,18 @@ module ManifestationsHelper
     end
   end
 
+  def pub_year_facet(pub_date_from, pub_date_to, facet)
+    string = ''
+    current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_to.to_i
+    if current
+      content_tag :strong do
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => facet.value.last.to_i - 1, :page => nil, :view => nil, :only_path => true)))
+      end
+    else
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => facet.value.last.to_i - 1, :page => nil, :view => nil, :only_path => true)))
+    end
+  end
+
   def title_with_volume_number(manifestation)
     title = manifestation.original_title
     if manifestation.volume_number_string?

data/app/models/manifestation.rb

@@ -115,6 +115,9 @@ class Manifestation < ActiveRecord::Base
       end
     end
     time :date_of_publication
+    integer :pub_year do
+      date_of_publication.try(:year)
+    end
     integer :creator_ids, :multiple => true
     integer :contributor_ids, :multiple => true
     integer :publisher_ids, :multiple => true

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

@@ -1,7 +1,8 @@
-<%= render 'manifestations/reservable_facet' if defined?(EnjuCirculation) -%>
 <%= render 'manifestations/carrier_type_facet' -%>
 <%= render 'manifestations/library_facet' -%>
 <%= render 'manifestations/language_facet' -%>
+<%= render 'manifestations/pub_year_facet' -%>
 <%=
     #render 'manifestations/subject_facet'
 -%>
+<%= render 'manifestations/reservable_facet' if defined?(EnjuCirculation) -%>

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

@@ -0,0 +1,11 @@
+<h4><%= t('activerecord.attributes.manifestation.date_of_publication') -%></h4>
+<ul>
+  <%- @pub_year_facet.each do |facet| -%>
+    <li>
+      <%= pub_year_facet(params[:pub_date_from].to_s, params[:pub_date_to].to_s, facet) %>
+    </li>
+  <%- end -%>
+  <%- if params[:pub_date_from] and params[:pub_date_to] -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:pub_date_from => nil, :pub_date_to => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+  <%- end -%>
+</ul>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre14"
+  VERSION = "0.1.0.pre15"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -208,6 +208,15 @@ describe ManifestationsController do
         assigns(:library_facet).should_not be_empty
       end
 
+      it "should get index_pub_year_facet" do
+        get :index, :view => 'pub_year_facet'
+        response.should be_success
+        assigns(:pub_year_facet).first.value.should eq 2010.0..2020.0
+        assigns(:pub_year_facet).first.count.should eq 1
+        assigns(:pub_year_facet).last.value.should eq 2000.0..2010.0
+        assigns(:pub_year_facet).last.count.should eq 1
+      end
+
       it "should get tag_cloud" do
         get :index, :query => '2005', :view => 'tag_cloud'
         response.should be_success

data/spec/dummy/config/application.yml

@@ -28,6 +28,10 @@ defaults: &defaults
   uploaded_file:
     storage: :local
 
+  manifestation:
+    facet:
+      pub_year_range_interval: 10
+
 development:
   <<: *defaults
 

data/spec/fixtures/manifestations.yml

@@ -1755,7 +1755,7 @@ manifestation_00205:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication:
+  date_of_publication: 2000-01-01 00:00:00 +09:00
   access_address:
   id: 205
   height:
@@ -1770,7 +1770,7 @@ manifestation_00206:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication:
+  date_of_publication: 2010-01-01 00:00:00 +09:00
   access_address:
   id: 206
   height:
@@ -1942,25 +1942,32 @@ manifestation_00216:
   required_role_id: 1
   repository_content: false
 
+
+
+
+
+
+
+
 # == Schema Information
 #
 # 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
@@ -1980,13 +1987,13 @@ manifestation_00216:
 #  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
@@ -1999,17 +2006,17 @@ manifestation_00216:
 #  date_submitted                  :datetime
 #  date_accepted                   :datetime
 #  date_caputured                  :datetime
+#  ndl_bib_id                      :string(255)
 #  pub_date                        :string(255)
 #  edition_string                  :string(255)
 #  volume_number                   :integer
 #  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_fingerprint          :string(255)
 #  attachment_meta                 :text
 #  month_of_publication            :integer
-#  fulltext_content                :boolean
-#  doi                             :string(255)
 #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre14
+  version: 0.1.0.pre15
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nested_form
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -748,7 +764,7 @@ files:
 - app/views/manifestations/_not_found.html.erb
 - app/views/manifestations/_paginate_id_link.html.erb
 - app/views/manifestations/_pickup.html.erb
-- app/views/manifestations/_pubdate_facet.html.erb
+- app/views/manifestations/_pub_year_facet.html.erb
 - app/views/manifestations/_question_list.html.erb
 - app/views/manifestations/_reservable_facet.html.erb
 - app/views/manifestations/_search_engine.html.erb
@@ -1202,7 +1218,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_hoi
+- spec/dummy/solr/data/test/index/segments_8c
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
@@ -1435,7 +1451,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4212379406218920042
+      hash: 1593504742697642523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1641,7 +1657,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_hoi
+- spec/dummy/solr/data/test/index/segments_8c
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role

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

@@ -1,9 +0,0 @@
-<ul>
-  <%- @languages.each do |language| -%>
-    <li>
-    <%- if params[:language] == language.name -%><strong><%- end -%>
-      <%= link_to h("#{language.display_name.localize} (#{@language_facet_results[language.name].to_i})"), url_for(:params => session[:params][:manifestation].merge(:page => nil, :language => language.name, :view => nil)) -%>
-    <%- if params[:language] == language.name -%></strong><%- end -%>
-    </li>
-  <%- end -%>
-</ul>