enju_biblio 0.0.2 → 0.0.3

data/app/controllers/manifestations_controller.rb

@@ -12,7 +12,7 @@ class ManifestationsController < ApplicationController
   before_filter :get_item, :get_libraries, :only => :index
   before_filter :prepare_options, :only => [:new, :edit]
   before_filter :get_version, :only => [:show]
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, :only => :destroy
   after_filter :convert_charset, :only => :index
   cache_sweeper :manifestation_sweeper, :only => [:create, :update, :destroy]
   include EnjuOai::OaiController if defined?(EnjuOai)
@@ -138,8 +138,12 @@ class ManifestationsController < ApplicationController
         end
         if series_statement
           with(:periodical_master).equal_to false
-          if mode != 'add'
-            with(:periodical).equal_to true
+          if series_statement.periodical?
+            if mode != 'add'
+              with(:periodical).equal_to true
+            end
+          else
+            with(:periodical).equal_to false
           end
         else
           if mode != 'add'
@@ -187,20 +191,29 @@ class ManifestationsController < ApplicationController
         session[:query] = @query
       end
 
-      unless session[:manifestation_ids]
-        manifestation_ids = search.build do
-          paginate :page => 1, :per_page => configatron.max_number_of_results
-        end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
-        session[:manifestation_ids] = manifestation_ids
-      end
+      if params[:format] == 'html' or params[:format].nil?
+        @search_query = Digest::SHA1.hexdigest(Marshal.dump(search.query.to_params).force_encoding('UTF-8'))
+        if flash[:search_query] == @search_query
+          flash.keep(:search_query)
+        else
+          #raise flash[:search_query].to_s
+          flash[:search_query] = @search_query
+          @manifestation_ids = search.build do
+            paginate :page => 1, :per_page => configatron.max_number_of_results
+          end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
+        end
 
-      if defined?(EnjuBookmark)
-        if session[:manifestation_ids]
+        if defined?(EnjuBookmark)
           if params[:view] == 'tag_cloud'
-            bookmark_ids = Bookmark.where(:manifestation_id => session[:manifestation_ids]).limit(1000).select(:id).collect(&:id)
+            unless @manifestation_ids
+              @manifestation_ids = search.build do
+                paginate :page => 1, :per_page => configatron.max_number_of_results
+              end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
+            end
+            #bookmark_ids = Bookmark.where(:manifestation_id => flash[:manifestation_ids]).limit(1000).select(:id).collect(&:id)
+            bookmark_ids = Bookmark.where(:manifestation_id => @manifestation_ids).limit(1000).select(:id).collect(&:id)
             @tags = Tag.bookmarked(bookmark_ids)
             render :partial => 'manifestations/tag_cloud'
-            #session[:manifestation_ids] = nil
             return
           end
         end
@@ -240,7 +253,7 @@ class ManifestationsController < ApplicationController
 
       if defined?(EnjuBookmark)
         # TODO: 検索結果が少ない場合にも表示させる
-        if manifestation_ids.blank?
+        if @manifestation_ids.blank?
           if query.respond_to?(:suggest_tags)
             @suggested_tag = query.suggest_tags.first
           end
@@ -330,10 +343,12 @@ class ManifestationsController < ApplicationController
 
     return if render_mode(params[:mode])
 
+    flash.keep(:search_query)
     store_location
 
     if @manifestation.periodical_master?
       flash.keep(:notice) if flash[:notice]
+      flash[:manifestation_id] = @manifestation.id
       redirect_to series_statement_url(@manifestation.series_statement, :manifestation_id => @manifestation.id)
       return
     end
@@ -355,10 +370,6 @@ class ManifestationsController < ApplicationController
       end
     end
 
-    if session[:manifestation_ids]
-      @manifestation_ids = session[:manifestation_ids]
-    end
-
     respond_to do |format|
       format.html # show.html.erb
       format.mobile
@@ -416,6 +427,7 @@ class ManifestationsController < ApplicationController
       end
     end
     @original_manifestation = Manifestation.where(:id => params[:manifestation_id]).first
+    @series_statement = @manifestation.series_statement unless @series_statement
     if defined?(EnjuBookmark)
       if params[:mode] == 'tag_edit'
         @bookmark = current_user.bookmarks.where(:manifestation_id => @manifestation.id).first if @manifestation rescue nil
@@ -436,6 +448,7 @@ class ManifestationsController < ApplicationController
 
     respond_to do |format|
       if @manifestation.save
+        Sunspot.commit
         Manifestation.transaction do
           if @original_manifestation
             @manifestation.derived_manifestations << @original_manifestation
@@ -457,6 +470,7 @@ class ManifestationsController < ApplicationController
   def update
     respond_to do |format|
       if @manifestation.update_attributes(params[:manifestation])
+        Sunspot.commit
         format.html { redirect_to @manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.manifestation')) }
         format.json { head :no_content }
       else
@@ -470,7 +484,9 @@ class ManifestationsController < ApplicationController
   # DELETE /manifestations/1
   # DELETE /manifestations/1.json
   def destroy
+    series_statement = @manifestation.series_statement
     @manifestation.destroy
+    series_statement.try(:index!)
 
     respond_to do |format|
       format.html { redirect_to manifestations_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.manifestation')) }
@@ -526,7 +542,7 @@ class ManifestationsController < ApplicationController
     end
 
     unless options[:issn].blank?
-      query = "#{query} issn_s:#{options[:issn].gsub('-', '')}"
+      query = "#{query} issn_sm:#{options[:issn].gsub('-', '')}"
     end
 
     unless options[:lccn].blank?
@@ -631,7 +647,7 @@ class ManifestationsController < ApplicationController
     @roles = Role.all
     @languages = Language.all_cache
     @frequencies = Frequency.all
-    @nii_types = NiiType.all if defined?(NiiType)
+    @nii_types = NiiType.all if defined?(EnjuNii)
   end
 
   def get_index_patron

data/app/controllers/picture_files_controller.rb

@@ -41,24 +41,14 @@ class PictureFilesController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @picture_file }
-      format.download {
-        case params[:mode]
-        when 'download'
-          disposition = 'attachment'
-        else
-          disposition = 'inline'
-        end
-
-        if @picture_file.picture.path
-          if configatron.uploaded_file.storage == :s3
-            send_data data, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
-          else
-            if File.exist?(file) and File.file?(file)
-              send_file file, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
-            end
-          end
+      format.mobile {
+        if params[:format] == 'download'
+          render_image(file)
         end
       }
+      format.download {
+        render_image(file)
+      }
     end
   end
 
@@ -166,4 +156,23 @@ class PictureFilesController < ApplicationController
       return
     end
   end
+
+  def render_image(file)
+    case params[:mode]
+    when 'download'
+      disposition = 'attachment'
+    else
+      disposition = 'inline'
+    end
+
+    if @picture_file.picture.path
+      if configatron.uploaded_file.storage == :s3
+        send_data data, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
+      else
+        if File.exist?(file) and File.file?(file)
+          send_file file, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
+        end
+      end
+    end
+  end
 end

data/app/controllers/series_has_manifestations_controller.rb

@@ -52,6 +52,7 @@ class SeriesHasManifestationsController < ApplicationController
   def create
     respond_to do |format|
       if @series_has_manifestation.save
+        Sunspot.commit
         format.html { redirect_to @series_has_manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.series_has_manifestation')) }
         format.json { render :json => @series_has_manifestation, :status => :created, :location => @series_has_manifestation }
       else
@@ -64,8 +65,11 @@ class SeriesHasManifestationsController < ApplicationController
   # PUT /series_has_manifestations/1
   # PUT /series_has_manifestations/1.json
   def update
+    old_series_statement = @series_has_manifestation.manifestation.series_statement
     respond_to do |format|
       if @series_has_manifestation.update_attributes(params[:series_has_manifestation])
+        old_series_statement.index
+        Sunspot.commit
         format.html { redirect_to @series_has_manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.series_has_manifestation')) }
         format.json { head :no_content }
       else

data/app/controllers/series_statements_controller.rb

@@ -46,16 +46,18 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/1
   # GET /series_statements/1.json
   def show
-    @manifestations = @series_statement.manifestations.order('date_of_publication DESC').page(params[:manifestation_page]).per_page(Manifestation.per_page)
-    if session[:manifestation_ids]
-      @manifestation_ids = session[:manifestation_ids]
-    end
-    store_location
+    #@manifestations = @series_statement.manifestations.order('date_of_publication DESC').page(params[:manifestation_page]).per_page(Manifestation.per_page)
+    #store_location
 
     respond_to do |format|
-      format.html # show.html.erb
+      format.html { # show.html.erb
+        redirect_to series_statement_manifestations_url(@series_statement)
+      }
       format.json { render :json => @series_statement }
-      format.js
+      #format.js
+      format.mobile {
+        redirect_to series_statement_manifestations_url(@series_statement)
+      }
     end
   end
 

data/app/helpers/series_statements_helper.rb

@@ -1,3 +1,9 @@
 module SeriesStatementsHelper
   include ManifestationsHelper
+
+  def series_pagination_link
+    if flash[:manifestation_id]
+      render 'manifestations/paginate_id_link', :manifestation => Manifestation.find(flash[:manifestation_id])
+    end
+  end
 end

data/app/models/item.rb

@@ -31,6 +31,8 @@ class Item < ActiveRecord::Base
   has_paper_trail
   normalize_attributes :item_identifier
 
+  enju_export
+
   searchable do
     text :item_identifier, :note, :title, :creator, :contributor, :publisher
     string :item_identifier
@@ -83,6 +85,7 @@ class Item < ActiveRecord::Base
     searchable do
       integer :circulation_status_id
     end
+    attr_accessible :item_has_use_restriction_attributes
     accepts_nested_attributes_for :item_has_use_restriction
 
     def set_circulation_status

data/app/models/manifestation.rb

@@ -15,11 +15,11 @@ class Manifestation < ActiveRecord::Base
   scope :periodical_master, where(:periodical => false)
   scope :periodical_children, where(:periodical => true)
   has_many :creates, :dependent => :destroy, :foreign_key => 'work_id'
-  has_many :creators, :through => :creates, :source => :patron
+  has_many :creators, :through => :creates, :source => :patron, :order => 'creates.position'
   has_many :realizes, :dependent => :destroy, :foreign_key => 'expression_id'
-  has_many :contributors, :through => :realizes, :source => :patron
+  has_many :contributors, :through => :realizes, :source => :patron, :order => 'realizes.position'
   has_many :produces, :dependent => :destroy, :foreign_key => 'manifestation_id'
-  has_many :publishers, :through => :produces, :source => :patron
+  has_many :publishers, :through => :produces, :source => :patron, :order => 'produces.position'
   has_many :exemplifies, :dependent => :destroy
   has_many :items, :through => :exemplifies
   has_many :children, :foreign_key => 'parent_id', :class_name => 'ManifestationRelationship', :dependent => :destroy
@@ -35,6 +35,7 @@ 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
+  belongs_to :nii_type if defined?(EnjuNii)
   accepts_nested_attributes_for :series_has_manifestation
 
   searchable do
@@ -43,7 +44,11 @@ class Manifestation < ActiveRecord::Base
     end
     text :fulltext, :note, :creator, :contributor, :publisher, :description
     text :item_identifier do
-      items.collect(&:item_identifier)
+      if periodical_master?
+        series_statement.manifestations.collect{|m| m.items.collect(&:item_identifier)}.flatten
+      else
+        items.collect(&:item_identifier)
+      end
     end
     string :title, :multiple => true
     # text フィールドだと区切りのない文字列の index が上手く作成
@@ -74,13 +79,21 @@ class Manifestation < ActiveRecord::Base
       carrier_type.name
     end
     string :library, :multiple => true do
-      items.map{|i| i.shelf.library.name}
+      if periodical_master?
+        series_statement.manifestations.map{|m| m.items.map{|i| i.shelf.library.name}}.flatten.uniq
+      else
+        items.map{|i| i.shelf.library.name}
+      end
     end
     string :language do
       language.try(:name)
     end
     string :item_identifier, :multiple => true do
-      items.collect(&:item_identifier)
+      if periodical_master?
+        series_statement.manifestations.collect{|m| m.items.collect(&:item_identifier)}.flatten
+      else
+        items.collect(&:item_identifier)
+      end
     end
     string :shelf, :multiple => true do
       items.collect{|i| "#{i.shelf.library.name}_#{i.shelf.name}"}
@@ -143,14 +156,13 @@ class Manifestation < ActiveRecord::Base
     text :isbn do  # 前方一致検索のためtext指定を追加
       [isbn, isbn10, wrong_isbn]
     end
-    text :issn  # 前方一致検索のためtext指定を追加
-    #text :ndl_jpno do
-      # TODO 詳細不明
-    #end
-    #string :ndl_dpid do
-      # TODO 詳細不明
-    #end
-    # OTC end
+    text :issn do # 前方一致検索のためtext指定を追加
+      if periodical_master?
+        series_statement.issn
+      else
+        issn
+      end
+    end
     string :sort_title
     boolean :periodical do
       periodical?
@@ -167,6 +179,8 @@ class Manifestation < ActiveRecord::Base
   enju_oai
   #enju_calil_check
   #enju_cinii
+  enju_export
+
   has_paper_trail
   if configatron.uploaded_file.storage == :s3
     has_attached_file :attachment, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml"
@@ -256,7 +270,7 @@ class Manifestation < ActiveRecord::Base
 
     while date.nil? do
       pub_date_string += '-01'
-      break if date =~ /-01-01-01$/
+      break if pub_date_string =~ /-01-01-01$/
       begin
         date = Time.zone.parse(pub_date_string)
       rescue ArgumentError

data/app/models/patron.rb

@@ -77,6 +77,8 @@ class Patron < ActiveRecord::Base
     integer :patron_type_id
   end
 
+  enju_export
+
   def self.per_page
     10
   end

data/app/models/resource_import_file.rb

@@ -11,7 +11,9 @@ class ResourceImportFile < ActiveRecord::Base
       :path => "resource_import_files/:id/:filename",
       :s3_permissions => :private
   else
-    has_attached_file :resource_import, :path => ":rails_root/private:url"
+    has_attached_file :resource_import,
+      :path => ":rails_root/private/system/:attachment/:id/:style/:filename",
+      :url => "/system/:attachment/:id/:style/:filename"
   end
   validates_attachment_content_type :resource_import, :content_type => ['text/csv', 'text/plain', 'text/tab-separated-values', 'application/octet-stream']
   validates_attachment_presence :resource_import
@@ -259,6 +261,15 @@ class ResourceImportFile < ActiveRecord::Base
         item.note = row['note'] if row['note']
         item.save!
         ExpireFragmentCache.expire_fragment_cache(item.manifestation)
+      else
+        manifestation_identifier = row['manifestation_identifier'].to_s.strip
+        manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first if manifestation_identifier.present?
+        unless manifestation
+          manifestation = Manifestation.where(:id => row['manifestation_id']).first
+        end
+        if manifestation
+          fetch(row, :edit_mode => 'update')
+        end
       end
       row_num += 1
     end
@@ -318,6 +329,7 @@ class ResourceImportFile < ActiveRecord::Base
       import_result.save!
       row_num += 1
     end
+    sm_complete!
   end
 
   private
@@ -388,6 +400,11 @@ class ResourceImportFile < ActiveRecord::Base
       manifestation = nil
     when 'update'
       manifestation = Item.where(:item_identifier => row['item_identifier'].to_s.strip).first.try(:manifestation)
+      unless manifestation
+        manifestation_identifier = row['manifestation_identifier'].to_s.strip
+        manifestation = Manifestation.where(:manifestation_identifier => manifestation_identifier).first if manifestation_identifier
+        manifestation = Manifestation.where(:id => row['manifestation_id']).first unless manifestation
+      end
     end
 
     title = {}
@@ -418,7 +435,6 @@ 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
-    language = Language.where(:name => 'unknown').first unless language
 
     if end_page >= 1
       start_page = 1
@@ -454,7 +470,7 @@ class ResourceImportFile < ActiveRecord::Base
       when 'update'
         expression = manifestation
         work = expression
-        work.series_statement = series_statement
+        work.series_statement = series_statement if series_statement
         work.creators = creator_patrons.uniq unless creator_patrons.empty?
         expression.contributors = contributor_patrons.uniq unless contributor_patrons.empty?
         if defined?(EnjuSubject)
@@ -465,7 +481,7 @@ class ResourceImportFile < ActiveRecord::Base
         volume_number = row['volume_number'].to_s.tr('０-９', '0-9').to_i
       end
 
-      manifestation = self.class.import_manifestation(expression, publisher_patrons, {
+      attributes = {
         :original_title => title[:original_title],
         :title_transcription => title[:title_transcription],
         :title_alternative => title[:title_alternative],
@@ -492,19 +508,34 @@ class ResourceImportFile < ActiveRecord::Base
         :end_page => end_page,
         :access_address => row['access_addres'],
         :manifestation_identifier => row['manifestation_identifier']
-      },
+      }.delete_if{|key, value| value.nil?}
+      manifestation = self.class.import_manifestation(expression, publisher_patrons, attributes,
       {
         :edit_mode => options[:edit_mode]
       })
-      manifestation.volume_number = volume_number
-      manifestation.required_role = Role.where(:name => row['required_role_name'].to_s.strip.camelize).first || Role.find('Guest')
-      manifestation.language = language
-      manifestation.series_statement = series_statement
+      manifestation.volume_number = volume_number if volume_number
+
+      required_role = Role.where(:name => row['required_role_name'].to_s.strip.camelize).first
+      if required_role and row['required_role_name'].present?
+        manifestation.required_role = required_role
+      else
+        manifestation.required_role = Role.where(:name => 'Guest').first unless manifestation.required_role
+      end
+
+      if language and row['language'].present?
+        manifestation.language = language
+      else
+        manifestation.language = Language.where(:name => 'unknown').first unless manifestation.language
+      end
+
+      manifestation.series_statement = series_statement if series_statement
       manifestation.save!
 
-      manifestation.set_patron_role_type(creators_list)
-      manifestation.set_patron_role_type(contributors_list, :scope => :contributor)
-      manifestation.set_patron_role_type(publishers_list, :scope => :publisher)
+      if options[:edit_mode] == 'create'
+        manifestation.set_patron_role_type(creators_list)
+        manifestation.set_patron_role_type(contributors_list, :scope => :contributor)
+        manifestation.set_patron_role_type(publishers_list, :scope => :publisher)
+      end
     end
     manifestation
   end
@@ -551,10 +582,14 @@ class ResourceImportFile < ActiveRecord::Base
   def find_series_statement(row)
     issn = StdNum::ISSN.normalize(row['issn'].to_s)
     series_statement_identifier = row['series_statement_identifier'].to_s.strip
+    series_statement_id = row['series_statement_id'].to_s.strip
     series_statement = SeriesStatement.where(:issn => issn).first if issn.present?
     unless series_statement
       series_statement = SeriesStatement.where(:series_statement_identifier => series_statement_identifier).first if series_statement_identifier.present?
     end
+    unless series_statement
+      series_statement = SeriesStatement.where(:id => series_statement_id).first if series_statement_id
+    end
     series_statement = SeriesStatement.where(:original_title => row['series_statement_original_title'].to_s.strip).first unless series_statement
     series_statement
   end