enju_biblio 0.1.0.pre59 → 0.1.0.pre60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ceea65fa2fd0dde7859b7ec7fa0a88cc52a405
-  data.tar.gz: df6464621c8ac53a04b1aa8f29a2200c3de2ebdd
+  metadata.gz: 77e66722d8f410327b55342e07cc4b22dc248689
+  data.tar.gz: bf6130dc2db15b7f330b4c1144ce7d533878e46e
 SHA512:
-  metadata.gz: ae4f233648ed51887c34c2b717f6cdb0360f3b4f96bbc57478ee94f407b0fcaa589e81ec13860f9ad85dc56443280a3d3314c20b6cddb1e500f8163d1fba058b
-  data.tar.gz: 1bd33c32c5d9388d82dac5c3b2064670af28f2468f0a5d125751adf60df89ddc1c31b7dd3d9918765c7dabc9d7be7c90272103e4a77ff9f5330a7e432979a986
+  metadata.gz: 4450a5220552ed75a7336f672ba935b2336e9165553c2ecc78c227f53a7e3ea74b6a3c48007f81847c914439c2ddfb76fd16acf09aba81171ec09df6ffbb99ae
+  data.tar.gz: 69a0a4f258bbdf77d691ecd8fae88f67f8cdbcae6a0c6fd5a5d00844db90424d98c9665a576e7b550fa3240cbd49328ae75bd9d532c80583ed986923e560f1c7

data/app/controllers/agents_controller.rb

@@ -12,10 +12,6 @@ class AgentsController < ApplicationController
   # GET /agents
   # GET /agents.json
   def index
-    #session[:params] = {} unless session[:params]
-    #session[:params][:agent] = params
-    # 最近追加されたパトロン
-    #@query = params[:query] ||= "[* TO *]"
     if params[:mode] == 'add'
       unless current_user.try(:has_role?, 'Librarian')
         access_denied; return
@@ -32,7 +28,7 @@ class AgentsController < ApplicationController
     order = nil
     @count = {}
 
-    search = Agent.search(:include => [:agent_type, :required_role])
+    search = Agent.search(include: [:agent_type, :required_role])
     search.data_accessor_for(Agent).select = [
       :id,
       :full_name,
@@ -79,11 +75,11 @@ class AgentsController < ApplicationController
     search.query.paginate(page, Agent.default_per_page)
     @agents = search.execute!.results
 
-    flash[:page_info] = {:page => page, :query => query}
+    flash[:page_info] = { page: page, query: query }
 
     respond_to do |format|
       format.html # index.html.erb
-      format.xml  { render :xml => @agents }
+      format.xml  { render xml: @agents }
       format.rss  { render layout: false }
       format.atom
       format.json { render json: @agents }
@@ -112,17 +108,17 @@ class AgentsController < ApplicationController
     @works = Manifestation.search do
       with(:creator_ids).equal_to agent.id
       with(:required_role_id).less_than_or_equal_to role.id
-      paginate :page => params[:work_list_page], :per_page => Manifestation.default_per_page
+      paginate page: params[:work_list_page], per_page: Manifestation.default_per_page
     end.results
     @expressions = Manifestation.search do
       with(:contributor_ids).equal_to agent.id
       with(:required_role_id).less_than_or_equal_to role.id
-      paginate :page => params[:expression_list_page], :per_page => Manifestation.default_per_page
+      paginate page: params[:expression_list_page], per_page: Manifestation.default_per_page
     end.results
     @manifestations = Manifestation.search do
       with(:publisher_ids).equal_to agent.id
       with(:required_role_id).less_than_or_equal_to role.id
-      paginate :page => params[:manifestation_list_page], :per_page => Manifestation.default_per_page
+      paginate page: params[:manifestation_list_page], per_page: Manifestation.default_per_page
     end.results
 
     respond_to do |format|
@@ -138,7 +134,7 @@ class AgentsController < ApplicationController
   def new
     @agent = Agent.new
     @agent.required_role = Role.where(name: 'Guest').first
-    @agent.language = Language.where(:iso_639_1 => I18n.default_locale.to_s).first || Language.first
+    @agent.language = Language.where(iso_639_1: I18n.default_locale.to_s).first || Language.first
     @agent.country = current_user.profile.library.country
     prepare_options
 
@@ -217,7 +213,7 @@ class AgentsController < ApplicationController
     @countries = Country.all_cache
     @agent_types = AgentType.all
     @roles = Role.all
-    @languages = Language.all_cache
-    @agent_type = AgentType.where(name: 'Person').first
+    @languages = Language.all
+    @agent_type = AgentType.where(name: 'person').first
   end
 end

data/app/controllers/items_controller.rb

@@ -116,7 +116,7 @@ class ItemsController < ApplicationController
       end
     end
 
-    flash[:page_info] = {:page => page, :query => query}
+    flash[:page_info] = { page: page, query: query }
 
     respond_to do |format|
       format.html # index.html.erb
@@ -250,7 +250,7 @@ class ItemsController < ApplicationController
   def prepare_options
     @libraries = Library.real << Library.web
     if @item.new_record?
-      @library = Library.real.first(:order => :position, :include => :shelves)
+      @library = Library.real.includes(:shelves).order(:position).first
     else
       @library = @item.shelf.library
     end

data/app/controllers/manifestations_controller.rb

@@ -53,10 +53,10 @@ class ManifestationsController < ApplicationController
               @manifestation = Manifestation.find_by_oai_identifier(params[:identifier])
             rescue ActiveRecord::RecordNotFound
               @oai[:errors] << "idDoesNotExist"
-              render :formats => :oai, layout: false
+              render formats: :oai, layout: false
               return
             end
-            render template: 'manifestations/show', :formats => :oai, layout: false
+            render template: 'manifestations/show', formats: :oai, layout: false
             return
           end
         end
@@ -98,7 +98,7 @@ class ManifestationsController < ApplicationController
 
       includes = [:carrier_type, :series_statements]
       includes << :bookmarks if defined?(EnjuBookmark)
-      search = Manifestation.search(:include => includes)
+      search = Manifestation.search(include: includes)
       role = current_user.try(:role) || Role.default_role
       case @reservable
       when 'true'
@@ -113,7 +113,7 @@ class ManifestationsController < ApplicationController
       @index_agent = agent
       manifestation = @manifestation if @manifestation
       series_statement = @series_statement if @series_statement
-      parent = @parent = Manifestation.where(:id => params[:parent_id]).first if params[:parent_id].present?
+      parent = @parent = Manifestation.where(id: params[:parent_id]).first if params[:parent_id].present?
 
       if defined?(EnjuSubject)
         subject = @subject if @subject
@@ -209,7 +209,7 @@ class ManifestationsController < ApplicationController
           else
             flash[:search_query] = @search_query
             @manifestation_ids = search.build do
-              paginate :page => 1, :per_page => Setting.max_number_of_results
+              paginate page: 1, per_page: Setting.max_number_of_results
             end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
           end
         end
@@ -218,11 +218,11 @@ class ManifestationsController < ApplicationController
           if params[:view] == 'tag_cloud'
             unless @manifestation_ids
               @manifestation_ids = search.build do
-                paginate :page => 1, :per_page => Setting.max_number_of_results
+                paginate page: 1, per_page: Setting.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).pluck(:id)
-            bookmark_ids = Bookmark.where(:manifestation_id => @manifestation_ids).limit(1000).pluck(:id)
+            #bookmark_ids = Bookmark.where(manifestation_id: flash[:manifestation_ids]).limit(1000).pluck(:id)
+            bookmark_ids = Bookmark.where(manifestation_id: @manifestation_ids).limit(1000).pluck(:id)
             @tags = Tag.bookmarked(bookmark_ids)
             render partial: 'manifestations/tag_cloud'
             return
@@ -258,9 +258,9 @@ class ManifestationsController < ApplicationController
           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 :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
+          paginate page: page.to_i, per_page: per_page
         end
       end
       search_result = search.execute
@@ -270,7 +270,7 @@ class ManifestationsController < ApplicationController
         max_count = @count[:query_result]
       end
       @manifestations = Kaminari.paginate_array(
-        search_result.results, :total_count => max_count
+        search_result.results, total_count: max_count
       ).page(page)
 
       if params[:format].blank? or params[:format] == 'html'
@@ -280,7 +280,7 @@ class ManifestationsController < ApplicationController
         @pub_year_facet = search_result.facet(:pub_year).rows.reverse
       end
 
-      @search_engines = Rails.cache.fetch('search_engine_all'){SearchEngine.all}
+      @search_engines = SearchEngine.order(:position)
 
       if defined?(EnjuBookmark)
         # TODO: 検索結果が少ない場合にも表示させる
@@ -318,7 +318,7 @@ class ManifestationsController < ApplicationController
     respond_to do |format|
       format.html
       format.mobile
-      format.xml  { render :xml => @manifestations }
+      format.xml  { render xml: @manifestations }
       format.sru  { render layout: false }
       format.rss  { render layout: false }
       format.txt  { render layout: false }
@@ -374,22 +374,22 @@ class ManifestationsController < ApplicationController
     if @manifestation.series_master?
       flash.keep(:notice) if flash[:notice]
       flash[:manifestation_id] = @manifestation.id
-      redirect_to manifestations_url(:parent_id => @manifestation.id)
+      redirect_to manifestations_url(parent_id: @manifestation.id)
       return
     end
 
     if defined?(EnjuCirculation)
-      @reserved_count = Reserve.waiting.where(:manifestation_id => @manifestation.id, :checked_out_at => nil).count
-      @reserve = current_user.reserves.where(:manifestation_id => @manifestation.id).first if user_signed_in?
+      @reserved_count = Reserve.waiting.where(manifestation_id: @manifestation.id, checked_out_at: nil).count
+      @reserve = current_user.reserves.where(manifestation_id: @manifestation.id).first if user_signed_in?
     end
 
     if defined?(EnjuQuestion)
-      @questions = @manifestation.questions(:user => current_user, :page => params[:question_page])
+      @questions = @manifestation.questions(user: current_user, page: params[:question_page])
     end
 
     if @manifestation.attachment.path
       if Setting.uploaded_file.storage == :s3
-        data = open(@manifestation.attachment.url).read.force_encoding('UTF-8')
+        data = Faraday.get(@manifestation.attachment.url).body.force_encoding('UTF-8')
       else
         file = @manifestation.attachment.path
       end
@@ -403,7 +403,7 @@ class ManifestationsController < ApplicationController
         when 'related'
           render template: 'manifestations/related'
         else
-          render :xml => @manifestation
+          render xml: @manifestation
         end
       }
       format.rdf
@@ -414,7 +414,7 @@ class ManifestationsController < ApplicationController
       format.download {
         if @manifestation.attachment.path
           if Setting.uploaded_file.storage == :s3
-            send_data @manifestation.attachment.data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
+            send_data data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
           else
             if File.exist?(file) && File.file?(file)
               send_file file, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
@@ -434,8 +434,8 @@ class ManifestationsController < ApplicationController
   # GET /manifestations/new.json
   def new
     @manifestation = Manifestation.new
-    @manifestation.language = Language.where(:iso_639_1 => @locale).first
-    @parent = Manifestation.where(:id => params[:parent_id]).first if params[:parent_id].present?
+    @manifestation.language = Language.where(iso_639_1: @locale).first
+    @parent = Manifestation.where(id: params[:parent_id]).first if params[:parent_id].present?
     if @parent
       @manifestation.parent_id = @parent.id
       @manifestation.original_title = @parent.original_title
@@ -458,7 +458,7 @@ class ManifestationsController < ApplicationController
     end
     if defined?(EnjuBookmark)
       if params[:mode] == 'tag_edit'
-        @bookmark = current_user.bookmarks.where(:manifestation_id => @manifestation.id).first if @manifestation rescue nil
+        @bookmark = current_user.bookmarks.where(manifestation_id: @manifestation.id).first if @manifestation rescue nil
         render partial: 'manifestations/tag_edit', locals: {manifestation: @manifestation}
       end
       store_location unless params[:mode] == 'tag_edit'
@@ -469,7 +469,7 @@ class ManifestationsController < ApplicationController
   # POST /manifestations.json
   def create
     @manifestation = Manifestation.new(params[:manifestation])
-    parent = Manifestation.where(:id => @manifestation.parent_id).first
+    parent = Manifestation.where(id: @manifestation.parent_id).first
     unless @manifestation.original_title?
       @manifestation.original_title = @manifestation.attachment_file_name
     end
@@ -654,7 +654,7 @@ class ManifestationsController < ApplicationController
     when 'barcode'
       if defined?(EnjuBarcode)
         barcode = Barby::QrCode.new(@manifestation.id)
-        send_data(barcode.to_svg, :disposition => 'inline', type: 'image/svg+xml')
+        send_data(barcode.to_svg, disposition: 'inline', type: 'image/svg+xml')
       end
     when 'tag_edit'
       if defined?(EnjuBookmark)

data/app/controllers/picture_files_controller.rb

@@ -31,7 +31,7 @@ class PictureFilesController < ApplicationController
 
     if @picture_file.picture.path
       if Setting.uploaded_file.storage == :s3
-        file = open(@picture_file.picture.expiring_url).read.force_encoding('UTF-8')
+        file = Faraday.get(@picture_file.picture.expiring_url).body.force_encoding('UTF-8')
       else
         file = @picture_file.picture.path(size)
       end
@@ -190,10 +190,10 @@ class PictureFilesController < ApplicationController
 
     if @picture_file.picture.path
       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
+        send_data file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, disposition: disposition
       else
         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
+          send_file file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, disposition: disposition
         end
       end
     end

data/app/helpers/picture_files_helper.rb

@@ -1,15 +1,15 @@
 module PictureFilesHelper
-  def show_image(picture_file, options = {:size => :medium})
+  def show_image(picture_file, options = {size: :medium})
     case options[:size]
     when :medium
       if picture_file.picture.width.to_i >= 600
-        return image_tag picture_file_path(picture_file, :format => :download, :size => :medium), :alt => "*", :width => picture_file.picture.width(:medium), :height => picture_file.picture.height(:medium)
+        return image_tag picture_file_path(picture_file, format: :download, size: :medium), alt: "*", width: picture_file.picture.width(:medium), height: picture_file.picture.height(:medium)
       end
     when :thumb
       if picture_file.picture.width.to_i >= 100
-        return image_tag picture_file_path(picture_file, :format => :download, :size => :thumb), :alt => "*", :width => picture_file.picture.width(:thumb), :height => picture_file.picture.height(:thumb)
+        return image_tag picture_file_path(picture_file, format: :download, size: :thumb), alt: "*", width: picture_file.picture.width(:thumb), height: picture_file.picture.height(:thumb)
       end
     end
-    image_tag picture_file_path(picture_file, :format => :download, :size => :original), :alt => "*", :width => picture_file.picture.width, :height => picture_file.picture.height
+    image_tag picture_file_path(picture_file, format: :download, size: :original), alt: "*", width: picture_file.picture.width, height: picture_file.picture.height
   end
 end

data/app/models/agent_import_file.rb

@@ -7,13 +7,13 @@ class AgentImportFile < ActiveRecord::Base
   scope :stucked, -> { in_state(:pending).where('agent_import_files.created_at < ?', 1.hour.ago) }
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :agent_import, :storage => :s3, :s3_credentials => "#{Setting.amazon}",
-      :s3_permissions => :private
+    has_attached_file :agent_import, storage: :s3, s3_credentials: "#{Setting.amazon}",
+      s3_permissions: :private
   else
     has_attached_file :agent_import,
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :agent_import, :content_type => [
+  validates_attachment_content_type :agent_import, content_type: [
     'text/csv',
     'text/plain',
     'text/tab-separated-values',
@@ -51,19 +51,20 @@ class AgentImportFile < ActiveRecord::Base
 
   def import
     transition_to!(:started)
-    num = {:agent_imported => 0, :user_imported => 0, :failed => 0}
-    row_num = 1
+    num = { agent_imported: 0, user_imported: 0, failed: 0 }
     rows = open_import_file
     field = rows.first
+    row_num = 1
     if [field['first_name'], field['last_name'], field['full_name']].reject{|field| field.to_s.strip == ""}.empty?
       raise "You should specify first_name, last_name or full_name in the first line"
     end
     #rows.shift
 
+    AgentImportResult.create!(agent_import_file_id: id, body: rows.headers.join("\t"))
     rows.each do |row|
       row_num += 1
+      import_result = AgentImportResult.create!(agent_import_file_id: id, body: row.fields.join("\t"))
       next if row['dummy'].to_s.strip.present?
-      import_result = AgentImportResult.create!(:agent_import_file_id => self.id, body: row.fields.join("\t"))
 
       agent = Agent.new
       agent = set_agent_value(agent, row)
@@ -100,6 +101,7 @@ class AgentImportFile < ActiveRecord::Base
   def modify
     transition_to!(:started)
     rows = open_import_file
+    rows.shift
     row_num = 1
 
     rows.each do |row|
@@ -130,6 +132,7 @@ class AgentImportFile < ActiveRecord::Base
   def remove
     transition_to!(:started)
     rows = open_import_file
+    rows.shift
     row_num = 1
 
     rows.each do |row|
@@ -171,7 +174,6 @@ class AgentImportFile < ActiveRecord::Base
     file = CSV.open(tempfile, col_sep: "\t")
     header = file.first
     rows = CSV.open(tempfile, headers: header, col_sep: "\t")
-    AgentImportResult.create!(:agent_import_file_id => self.id, body: header.join("\t"))
     tempfile.close(true)
     file.close
     rows
@@ -202,13 +204,13 @@ class AgentImportFile < ActiveRecord::Base
 
     #if row['username'].to_s.strip.blank?
       agent.email = row['email'].to_s.strip
-      agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.find('Guest')
+      agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where(name: 'Guest').first
     #else
-    #  agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.find('Librarian')
+    #  agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where('Librarian').first
     #end
     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(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
     agent.language = language if language
     country = Country.where(name: row['country'].to_s.strip).first
     agent.country = country if country

data/app/models/agent_merge_list.rb

@@ -8,10 +8,10 @@ class AgentMergeList < ActiveRecord::Base
 
   def merge_agents(selected_agent)
     self.agents.each do |agent|
-      Create.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
-      Produce.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
-      Own.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
-      Donate.update_all(['agent_id = ?', selected_agent.id], ['agent_id = ?', agent.id])
+      Create.where(agent_id: selected_agent.id).update_all(agent_id: agent.id)
+      Produce.where(agent_id: selected_agent.id).update_all(agent_id: agent.id)
+      Own.where(agent_id: selected_agent.id).update_all(agent_id: agent.id)
+      Donate.where(agent_id: selected_agent.id).update_all(agent_id: agent.id)
       agent.destroy unless agent == selected_agent
     end
   end

data/app/models/item.rb

@@ -12,8 +12,8 @@ class Item < ActiveRecord::Base
     :manifestation_id, :library_id, :required_role_id,
     :binding_item_identifier, :binding_call_number, :binded_at
   scope :on_shelf, -> { where('shelf_id != 1') }
-  scope :on_web, -> { where(:shelf_id => 1) }
-  delegate :display_name, :to => :shelf, prefix: true
+  scope :on_web, -> { where(shelf_id: 1) }
+  delegate :display_name, to: :shelf, prefix: true
   has_many :owns
   has_many :agents, through: :owns
   has_many :donates
@@ -30,7 +30,7 @@ class Item < ActiveRecord::Base
     format: {with: /\A[0-9A-Za-z_]+\Z/}
   validates :binding_item_identifier, allow_blank: true,
     format: {with: /\A[0-9A-Za-z_]+\Z/}
-  validates :url, url: true, allow_blank: true, length: {:maximum => 255}
+  validates :url, url: true, allow_blank: true, length: { maximum: 255 }
   validates_date :acquired_at, allow_blank: true
 
   normalize_attributes :item_identifier, :binding_item_identifier,

data/app/models/language.rb

@@ -28,7 +28,7 @@ class Language < ActiveRecord::Base
   end
 
   def self.available_languages
-    Language.where(:iso_639_1 => I18n.available_locales.map{|l| l.to_s}).order(:position)
+    Language.where(iso_639_1: I18n.available_locales.map{|l| l.to_s}).order(:position)
   end
 
   private

data/app/models/manifestation.rb

@@ -503,6 +503,7 @@ class Manifestation < ActiveRecord::Base
       pub_date
       price
       isbn
+      issn
       item_identifier
       call_number
       item_price

data/app/models/produce.rb

@@ -3,7 +3,7 @@ class Produce < ActiveRecord::Base
   belongs_to :agent
   belongs_to :manifestation, touch: true
   belongs_to :produce_type
-  delegate :original_title, :to => :manifestation, :prefix => true
+  delegate :original_title, to: :manifestation, prefix: true
 
   validates_associated :agent, :manifestation
   validates_presence_of :agent, :manifestation

data/app/models/resource_export_file.rb

@@ -1,4 +1,5 @@
 class ResourceExportFile < ActiveRecord::Base
+  attr_accessible
   include Statesman::Adapters::ActiveRecordModel
   include ExportFile
   enju_export_file_model

data/app/models/resource_import_file.rb

@@ -63,15 +63,15 @@ class ResourceImportFile < ActiveRecord::Base
       failed: 0
     }
     rows = open_import_file(create_import_temp_file(resource_import))
-    row_num = 1
-
-    #field = rows.first
+    rows.shift
     #if [field['manifestation_id'], field['manifestation_identifier'], field['isbn'], field['original_title']].reject{|f|
     #  f.to_s.strip == ''
     #}.empty?
     #  raise "You should specify isbn or original_title in the first line"
     #end
+    row_num = 1
 
+    ResourceImportResult.create!(resource_import_file_id: id, body: rows.headers.join("\t"))
     rows.each do |row|
       row_num += 1
       import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
@@ -270,6 +270,7 @@ class ResourceImportFile < ActiveRecord::Base
   def modify
     transition_to!(:started)
     rows = open_import_file(create_import_temp_file(resource_import))
+    rows.shift
     row_num = 1
 
     rows.each do |row|
@@ -340,6 +341,7 @@ class ResourceImportFile < ActiveRecord::Base
   def remove
     transition_to!(:started)
     rows = open_import_file(create_import_temp_file(resource_import))
+    rows.shift
     row_num = 1
 
     rows.each do |row|
@@ -361,7 +363,8 @@ class ResourceImportFile < ActiveRecord::Base
   def update_relationship
     transition_to!(:started)
     rows = open_import_file(create_import_temp_file(resource_import))
-    row_num = 2
+    rows.shift
+    row_num = 1
 
     rows.each do |row|
       item_identifier = row['item_identifier'].to_s.strip
@@ -423,7 +426,7 @@ class ResourceImportFile < ActiveRecord::Base
       save!
     end
     rows = CSV.open(tempfile, headers: header, col_sep: "\t")
-    ResourceImportResult.create!(resource_import_file_id: id, body: header.join("\t"))
+    #ResourceImportResult.create!(resource_import_file_id: id, body: header.join("\t"))
     tempfile.close(true)
     file.close
     rows

data/app/views/agent_merge_lists/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @agent_merge_list -%></li>
     <li><%= link_to t('page.back'), agent_merge_lists_path -%></li>

data/app/views/agent_merge_lists/index.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
 
@@ -26,7 +26,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', model: t('activerecord.models.agent_merge_list')), new_agent_merge_list_path -%></li>
   </ul>

data/app/views/agent_merge_lists/new.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), :back -%></li>
   </ul>

data/app/views/agent_merge_lists/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', model: t('activerecord.models.agent_merge_list')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -22,7 +22,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>
     <li><%= link_to t('page.edit'), edit_agent_merge_list_path(@agent_merge_list) -%></li>

data/app/views/agent_merges/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
@@ -23,7 +23,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @agent_merge -%></li>
     <li><%= link_to t('page.back'), agent_merges_path -%></li>

data/app/views/agent_merges/index.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
@@ -23,7 +23,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @agent_merge_list -%>
       <li><%= link_to t('page.add', model: t('activerecord.models.agent')), agent_merge_list_agents_path(@agent_merge_list) -%></li>

data/app/views/agent_merges/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', model: t('activerecord.models.agent_merge')) -%></h1>
 <div id="content_list">
 
@@ -32,7 +32,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), agent_merges_path -%></li>
   </ul>