enju_biblio 0.1.0.pre58 → 0.1.0.pre59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d1d8279fdb15b0495e5c5dc35b7862a5fe84ab
-  data.tar.gz: cc18d562cb0fcdf4d8d8aa31b0a50e21e9357a6f
+  metadata.gz: 04ceea65fa2fd0dde7859b7ec7fa0a88cc52a405
+  data.tar.gz: df6464621c8ac53a04b1aa8f29a2200c3de2ebdd
 SHA512:
-  metadata.gz: 8ddf8dbff2d9adccaedc08830a8a6ea67143a8d57200b7019af6016f9af8dc1f91f3e0c6e2ce3d5c48ad232c1669f1b40bf4f7864f1651b2fcdd573bd48cf141
-  data.tar.gz: c01337714392fd34e4012e6fb7bea77c03d3f5161ce8d0efc432d63bef8b1f89bf0743203eddab448adf481df0d34c1bf982ec3b550a950517483f9817cac7de
+  metadata.gz: ae4f233648ed51887c34c2b717f6cdb0360f3b4f96bbc57478ee94f407b0fcaa589e81ec13860f9ad85dc56443280a3d3314c20b6cddb1e500f8163d1fba058b
+  data.tar.gz: 1bd33c32c5d9388d82dac5c3b2064670af28f2468f0a5d125751adf60df89ddc1c31b7dd3d9918765c7dabc9d7be7c90272103e4a77ff9f5330a7e432979a986

data/app/controllers/agent_merge_lists_controller.rb

@@ -0,0 +1,93 @@
+class AgentMergeListsController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /agent_merge_lists
+  # GET /agent_merge_lists.json
+  def index
+    @agent_merge_lists = AgentMergeList.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @agent_merge_lists }
+    end
+  end
+
+  # GET /agent_merge_lists/1
+  # GET /agent_merge_lists/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @agent_merge_list }
+    end
+  end
+
+  # GET /agent_merge_lists/new
+  # GET /agent_merge_lists/new.json
+  def new
+    @agent_merge_list = AgentMergeList.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @agent_merge_list }
+    end
+  end
+
+  # GET /agent_merge_lists/1/edit
+  def edit
+  end
+
+  # POST /agent_merge_lists
+  # POST /agent_merge_lists.json
+  def create
+    @agent_merge_list = AgentMergeList.new(params[:agent_merge_list])
+
+    respond_to do |format|
+      if @agent_merge_list.save
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.agent_merge_list'))
+        format.html { redirect_to(@agent_merge_list) }
+        format.json { render json: @agent_merge_list, status: :created, location: @agent_merge_list }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @agent_merge_list.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /agent_merge_lists/1
+  # PUT /agent_merge_lists/1.json
+  def update
+    respond_to do |format|
+      if @agent_merge_list.update_attributes(params[:agent_merge_list])
+        if params[:mode] == 'merge'
+          selected_agent = Agent.where(id: params[:selected_agent_id]).first
+          if selected_agent
+            @agent_merge_list.merge_agents(selected_agent)
+            flash[:notice] = t('merge_list.successfully_merged', model: t('activerecord.models.agent'))
+          else
+            flash[:notice] = t('merge_list.specify_id', model: t('activerecord.models.agent'))
+            redirect_to agent_merge_list_url(@agent_merge_list)
+            return
+          end
+        else
+          flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.agent_merge_list'))
+        end
+        format.html { redirect_to(@agent_merge_list) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @agent_merge_list.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /agent_merge_lists/1
+  # DELETE /agent_merge_lists/1.json
+  def destroy
+    @agent_merge_list.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(agent_merge_lists_url) }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/agent_merges_controller.rb

@@ -0,0 +1,87 @@
+class AgentMergesController < ApplicationController
+  load_and_authorize_resource
+  before_filter :get_agent, :get_agent_merge_list
+
+  # GET /agent_merges
+  # GET /agent_merges.json
+  def index
+    if @agent
+      @agent_merges = @agent.agent_merges.order('agent_merges.id').page(params[:page])
+    elsif @agent_merge_list
+      @agent_merges = @agent_merge_list.agent_merges.order('agent_merges.id').includes(:agent).page(params[:page])
+    else
+      @agent_merges = AgentMerge.page(params[:page])
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @agent_merges }
+    end
+  end
+
+  # GET /agent_merges/1
+  # GET /agent_merges/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @agent_merge }
+    end
+  end
+
+  # GET /agent_merges/new
+  # GET /agent_merges/new.json
+  def new
+    @agent_merge = AgentMerge.new
+    @agent_merge.agent = @agent
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @agent_merge }
+    end
+  end
+
+  # GET /agent_merges/1/edit
+  def edit
+  end
+
+  # POST /agent_merges
+  # POST /agent_merges.json
+  def create
+    @agent_merge = AgentMerge.new(params[:agent_merge])
+
+    respond_to do |format|
+      if @agent_merge.save
+        format.html { redirect_to(@agent_merge, notice: t('controller.successfully_created', model: t('activerecord.models.agent_merge'))) }
+        format.json { render json: @agent_merge, status: :created, location: @agent_merge }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @agent_merge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /agent_merges/1
+  # PUT /agent_merges/1.json
+  def update
+    respond_to do |format|
+      if @agent_merge.update_attributes(params[:agent_merge])
+        format.html { redirect_to(@agent_merge, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_merge'))) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @agent_merge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /agent_merges/1
+  # DELETE /agent_merges/1.json
+  def destroy
+    @agent_merge.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(agent_merges_url) }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/agent_relationships_controller.rb

@@ -65,7 +65,7 @@ class AgentRelationshipsController < ApplicationController
   # PUT /agent_relationships/1.json
   def update
     # 並べ替え
-    if @agent and params[:move]
+    if @agent && params[:move]
       move_position(@agent_relationship, params[:move], false)
       redirect_to agent_relationships_url(agent_id: @agent_relationship.parent_id)
       return

data/app/controllers/agents_controller.rb

@@ -3,9 +3,7 @@ class AgentsController < ApplicationController
   load_and_authorize_resource except: :index
   authorize_resource only: :index
   before_filter :get_work, :get_expression, :get_manifestation, :get_item, :get_agent, except: [:update, :destroy]
-  if defined?(EnjuResourceMerge)
-    before_filter :get_agent_merge_list, except: [:create, :update, :destroy]
-  end
+  before_filter :get_agent_merge_list, except: [:create, :update, :destroy]
   before_filter :prepare_options, only: [:new, :edit]
   before_filter :store_location
   before_filter :get_version, only: [:show]

data/app/controllers/creates_controller.rb

@@ -33,10 +33,10 @@ class CreatesController < ApplicationController
 
   # GET /creates/new
   def new
-    if @agent and @work.blank?
+    if @agent && @work.blank?
       redirect_to agent_works_url(@patorn)
       return
-    elsif @work and @agent.blank?
+    elsif @work && @agent.blank?
       redirect_to work_agents_url(@work)
       return
     else
@@ -71,7 +71,7 @@ class CreatesController < ApplicationController
   # PUT /creates/1.json
   def update
     # 並べ替え
-    if @work and params[:move]
+    if @work && params[:move]
       move_position(@create, params[:move], false)
       redirect_to creates_url(work_id: @create.work_id)
       return

data/app/controllers/manifestation_relationships_controller.rb

@@ -65,7 +65,7 @@ class ManifestationRelationshipsController < ApplicationController
   # PUT /manifestation_relationships/1.json
   def update
     # 並べ替え
-    if @manifestation and params[:move]
+    if @manifestation && params[:move]
       move_position(@manifestation_relationship, params[:move], false)
       redirect_to manifestation_relationships_url(manifestation_id: @manifestation_relationship.parent_id)
       return

data/app/controllers/manifestations_controller.rb

@@ -48,7 +48,7 @@ class ManifestationsController < ApplicationController
           end
           page ||= 1
 
-          if params[:verb] == 'GetRecord' and params[:identifier]
+          if params[:verb] == 'GetRecord' && params[:identifier]
             begin
               @manifestation = Manifestation.find_by_oai_identifier(params[:identifier])
             rescue ActiveRecord::RecordNotFound
@@ -137,17 +137,17 @@ class ManifestationsController < ApplicationController
           with(:subject_ids).equal_to subject.id if subject
         end
         unless parent
-          if params[:periodical].to_s.downcase == "true"
+          if params[:serial].to_s.downcase == "true"
             with(:series_master).equal_to true unless parent
-            with(:periodical).equal_to true
-            #if series_statement.periodical?
+            with(:serial).equal_to true
+            #if series_statement.serial?
             #  if mode != 'add'
             #    order_by :volume_number, sort[:order]
             #    order_by :issue_number, sort[:order]
             #    order_by :serial_number, sort[:order]
             #  end
             #else
-            #  with(:periodical).equal_to false
+            #  with(:serial).equal_to false
             #end
           else
             if mode != 'add'
@@ -181,7 +181,7 @@ class ManifestationsController < ApplicationController
         :serial_number,
         :edition_string,
         :edition,
-        :periodical,
+        :serial,
         :statement_of_responsibility
       ] if params[:format] == 'html' or params[:format].nil?
       all_result = search.execute
@@ -416,7 +416,7 @@ class ManifestationsController < ApplicationController
           if Setting.uploaded_file.storage == :s3
             send_data @manifestation.attachment.data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
           else
-            if File.exist?(file) and File.file?(file)
+            if File.exist?(file) && File.file?(file)
               send_file file, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
             end
           end
@@ -440,7 +440,7 @@ class ManifestationsController < ApplicationController
       @manifestation.parent_id = @parent.id
       @manifestation.original_title = @parent.original_title
       @manifestation.title_transcription = @parent.title_transcription
-      @manifestation.periodical = true if @parent.periodical
+      @manifestation.serial = true if @parent.serial
     end
 
     respond_to do |format|
@@ -545,7 +545,7 @@ class ManifestationsController < ApplicationController
     #end
 
     #unless options[:library].blank?
-    #  library_list = options[:library].split.uniq.join(' and ')
+    #  library_list = options[:library].split.uniq.join(' && ')
     #  query = "#{query} library_sm:#{library_list}"
     #end
 
@@ -601,7 +601,7 @@ class ManifestationsController < ApplicationController
       query = "#{query} item_identifier_sm:#{options[:item_identifier]}"
     end
 
-    unless options[:number_of_pages_at_least].blank? and options[:number_of_pages_at_most].blank?
+    unless options[:number_of_pages_at_least].blank? && options[:number_of_pages_at_most].blank?
       number_of_pages = {}
       number_of_pages[:at_least] = options[:number_of_pages_at_least].to_i
       number_of_pages[:at_most] = options[:number_of_pages_at_most].to_i
@@ -745,7 +745,7 @@ class ManifestationsController < ApplicationController
   end
 
   def set_pub_date(query, options)
-    unless options[:pub_date_from].blank? and options[:pub_date_to].blank?
+    unless options[:pub_date_from].blank? && options[:pub_date_to].blank?
       options[:pub_date_from].to_s.gsub!(/\D/, '')
       options[:pub_date_to].to_s.gsub!(/\D/, '')
       pub_date = parse_pub_date(options)
@@ -755,7 +755,7 @@ class ManifestationsController < ApplicationController
   end
 
   def set_acquisition_date(query, options)
-    unless options[:acquired_from].blank? and options[:acquired_to].blank?
+    unless options[:acquired_from].blank? && options[:acquired_to].blank?
       options[:acquired_from].to_s.gsub!(/\D/, '')
       options[:acquired_to].to_s.gsub!(/\D/, '')
 

data/app/controllers/owns_controller.rb

@@ -31,10 +31,10 @@ class OwnsController < ApplicationController
 
   # GET /owns/new
   def new
-    if @item and @agent.blank?
+    if @item && @agent.blank?
       redirect_to item_agents_url(@item)
       return
-    elsif @agent and @item.blank?
+    elsif @agent && @item.blank?
       redirect_to agent_items_url(@agent)
       return
     else
@@ -67,7 +67,7 @@ class OwnsController < ApplicationController
   # PUT /owns/1
   # PUT /owns/1.json
   def update
-    if @item and params[:move]
+    if @item && params[:move]
       move_position(@own, params[:move], false)
       redirect_to owns_url(item_id: @own.item_id)
       return

data/app/controllers/picture_files_controller.rb

@@ -192,7 +192,7 @@ class PictureFilesController < ApplicationController
       if Setting.uploaded_file.storage == :s3
         send_data file, 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)
+        if File.exist?(file) && File.file?(file)
           send_file file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, :disposition => disposition
         end
       end

data/app/controllers/produces_controller.rb

@@ -38,10 +38,10 @@ class ProducesController < ApplicationController
 
   # GET /produces/new
   def new
-    if @agent and @manifestation.blank?
+    if @agent && @manifestation.blank?
       redirect_to agent_manifestations_url(@agent)
       return
-    elsif @manifestation and @agent.blank?
+    elsif @manifestation && @agent.blank?
       redirect_to manifestation_agents_url(@manifestation)
       return
     else
@@ -75,7 +75,7 @@ class ProducesController < ApplicationController
   # PUT /produces/1
   # PUT /produces/1.json
   def update
-    if @manifestation and params[:move]
+    if @manifestation && params[:move]
       move_position(@produce, params[:move], false)
       redirect_to produces_url(manifestation_id: @produce.manifestation_id)
       return

data/app/controllers/realizes_controller.rb

@@ -33,10 +33,10 @@ class RealizesController < ApplicationController
 
   # GET /realizes/new
   def new
-    if @expression and @agent.blank?
+    if @expression && @agent.blank?
       redirect_to expression_agents_url(@expression)
       return
-    elsif @agent and @expression.blank?
+    elsif @agent && @expression.blank?
       redirect_to agent_expressions_url(@agent)
       return
     else
@@ -71,7 +71,7 @@ class RealizesController < ApplicationController
   # PUT /realizes/1.json
   def update
     # 並べ替え
-    if @expression and params[:move]
+    if @expression && params[:move]
       move_position(@realize, params[:move], false)
       redirect_to realizes_url(expression_id: @realize.expression_id)
       return

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -0,0 +1,92 @@
+class SeriesStatementMergeListsController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /series_statement_merge_lists
+  # GET /series_statement_merge_lists.json
+  def index
+    @series_statement_merge_lists = SeriesStatementMergeList.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @series_statement_merge_lists }
+    end
+  end
+
+  # GET /series_statement_merge_lists/1
+  # GET /series_statement_merge_lists/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @series_statement_merge_list }
+    end
+  end
+
+  # GET /series_statement_merge_lists/new
+  # GET /series_statement_merge_lists/new.json
+  def new
+    @series_statement_merge_list = SeriesStatementMergeList.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @series_statement_merge_list }
+    end
+  end
+
+  # GET /series_statement_merge_lists/1/edit
+  def edit
+  end
+
+  # POST /series_statement_merge_lists
+  # POST /series_statement_merge_lists.json
+  def create
+    @series_statement_merge_list = SeriesStatementMergeList.new(params[:series_statement_merge_list])
+
+    respond_to do |format|
+      if @series_statement_merge_list.save
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.series_statement_merge_list'))
+        format.html { redirect_to(@series_statement_merge_list) }
+        format.json { render json: @series_statement_merge_list, status: :created, location: @series_statement_merge_list }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @series_statement_merge_list.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /series_statement_merge_lists/1
+  # PUT /series_statement_merge_lists/1.json
+  def update
+    respond_to do |format|
+      if @series_statement_merge_list.update_attributes(params[:series_statement_merge_list])
+        if params[:mode] == 'merge'
+          selected_series_statement = SeriesStatement.find(params[:selected_series_statement_id]) rescue nil
+          if selected_series_statement
+            flash[:notice] = t('merge_list.successfully_merged', model: t('activerecord.models.series_statement'))
+          else
+            flash[:notice] = t('merge_list.specify_id', model: t('activerecord.models.series_statement'))
+            redirect_to series_statement_merge_list_url(@series_statement_merge_list)
+            return
+          end
+        else
+          flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.series_statement_merge_list'))
+        end
+        format.html { redirect_to(@series_statement_merge_list) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @series_statement_merge_list.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /series_statement_merge_lists/1
+  # DELETE /series_statement_merge_lists/1.json
+  def destroy
+    @series_statement_merge_list.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(series_statement_merge_lists_url) }
+      format.json { head :no_content }
+    end
+  end
+end