enju_biblio 0.0.3 → 0.0.4

data/app/views/series_statements/_merge.html.erb

@@ -1,5 +1,5 @@
 <%= form_for :series_statements, :url => series_statements_path, :html => {:method => 'get'} do |f| -%>
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.series_statement.original_title') -%></th>

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

@@ -11,7 +11,7 @@
   <div id="tabs">
     <%= render 'tab_menu', :series_statement => @series_statement %>
     <div id="detail">
-      <table id="resource_detail">
+      <table class="table table-striped" id="resource_detail">
         <tr>
           <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
           <td style="width: 490px"><%= @series_statement.title_transcription %></td>

data/config/routes.rb

@@ -1,14 +1,4 @@
 Rails.application.routes.draw do
-  resources :works, :controller => 'manifestations' do
-    resources :patrons
-    resources :creates
-  end
-
-  resources :expressions, :controller => 'manifestations' do
-    resources :patrons
-    resources :realizes
-  end
-
   resources :manifestations do
     resources :patrons
     resources :produces
@@ -41,15 +31,25 @@ Rails.application.routes.draw do
     resources :produces
   end
 
-  resources :creators, :controller => 'patrons' do
+  resources :works, :controller => 'manifestations', :except => [:index, :new, :create] do
+    resources :patrons
+    resources :creates
+  end
+
+  resources :expressions, :controller => 'manifestations', :except => [:index, :new, :create] do
+    resources :patrons
+    resources :realizes
+  end
+
+  resources :creators, :controller => 'patrons', :except => [:index, :new, :create] do
     resources :manifestations
   end
 
-  resources :contributors, :controller => 'patrons' do
+  resources :contributors, :controller => 'patrons', :except => [:index, :new, :create] do
     resources :manifestations
   end
 
-  resources :publishers, :controller => 'patrons' do
+  resources :publishers, :controller => 'patrons', :except => [:index, :new, :create] do
     resources :manifestations
   end
 

data/lib/enju_biblio/biblio_helper.rb

@@ -0,0 +1,59 @@
+module EnjuBiblio
+  module BiblioHelper
+    def form_icon(carrier_type)
+      case carrier_type.name
+      when 'print'
+        image_tag('icons/book.png', :size => '16x16', :alt => carrier_type.display_name.localize)
+      when 'CD'
+        image_tag('icons/cd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
+      when 'DVD'
+        image_tag('icons/dvd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
+      when 'file'
+        image_tag('icons/monitor.png', :size => '16x16', :alt => carrier_type.display_name.localize)
+      else
+        image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
+      end
+    rescue NoMethodError
+      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
+    end
+
+    def content_type_icon(content_type)
+      case content_type.name
+      when 'text'
+        image_tag('icons/page_white_text.png', :size => '16x16', :alt => content_type.display_name.localize)
+      when 'picture'
+        image_tag('icons/picture.png', :size => '16x16', :alt => content_type.display_name.localize)
+      when 'sound'
+        image_tag('icons/sound.png', :size => '16x16', :alt => content_type.display_name.localize)
+      when 'video'
+        image_tag('icons/film.png', :size => '16x16', :alt => content_type.display_name.localize)
+      else
+        image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
+      end
+    rescue NoMethodError
+      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
+    end
+
+    def patron_type_icon(patron_type)
+      case patron_type
+      when 'Person'
+        image_tag('icons/user.png', :size => '16x16', :alt => 'Person')
+      when 'CorporateBody'
+        image_tag('icons/group.png', :size => '16x16', :alt => 'CorporateBody')
+      else
+        image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
+      end
+    end
+
+    def patrons_list(patrons = [], options = {})
+      return nil if patrons.blank?
+      patrons_list = []
+      if options[:nolink]
+        patrons_list = patrons.map{|patron| patron.full_name}
+      else
+        patrons_list = patrons.map{|patron| link_to(patron.full_name, patron, options)}
+      end
+      patrons_list.join(" ").html_safe
+    end
+  end
+end

data/lib/enju_biblio/engine.rb

@@ -12,6 +12,7 @@ require 'enju_ndl'
 require 'dynamic_form'
 require 'simple_form'
 require 'will_paginate/array'
+require 'resque_mailer'
 
 module EnjuBiblio
   class Engine < ::Rails::Engine

data/{spec/dummy/lib/enju_leaf → lib/enju_biblio}/porta_cql.rb

@@ -65,7 +65,7 @@ class Cql
 
   def date_range(from_date, until_date)
     unless from_date == '*' and until_date == '*'
-      ["date_of_publication_d:[#{from_date} TO #{until_date}]"]
+      ["pub_date_dm:[#{from_date} TO #{until_date}]"]
     else
       []
     end

data/{spec/dummy/lib/enju_leaf → lib/enju_biblio}/sru.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'enju_leaf/porta_cql'
+require 'enju_biblio/porta_cql'
 
 class QueryArgumentError < QueryError; end
 

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/enju_biblio.rb

@@ -1,4 +1,8 @@
 require "enju_biblio/engine"
+require "enju_biblio/openurl"
+require "enju_biblio/porta_cql"
+require "enju_biblio/sru"
+require "enju_biblio/biblio_helper"
 
 module EnjuBiblio
   def self.included(base)

data/spec/cassette_library/enju_ndl/manifestation.yml

@@ -17,7 +17,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Fri, 01 Jun 2012 00:05:07 GMT
+      - Sat, 02 Jun 2012 13:40:23 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -27,7 +27,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.224538"
+      - "0.153323"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -37,8 +37,8 @@ http_interactions:
       content-type: 
       - application/xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=7d526ab7c3f484c682b7ee59096e66bf; domain=.iss.ndl.go.jp; path=/; expires=Fri, 01-Jun-2012 01:05:07 GMT; HttpOnly
-      - serverid=1102; path=/
+      - _front_session_id=726567f43b738891cd20529045366623; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 14:40:23 GMT; HttpOnly
+      - serverid=1105; path=/
       vary: 
       - Accept-Encoding,User-Agent
       connection: 
@@ -102,7 +102,7 @@ http_interactions:
         ZGVzY3JpcHRpb24+CiAgICA8L2l0ZW0+CiAgPC9jaGFubmVsPgo8L3Jzcz4K
 
     http_version: "1.0"
-  recorded_at: Fri, 01 Jun 2012 00:05:08 GMT
+  recorded_at: Sat, 02 Jun 2012 13:40:23 GMT
 - request: 
     method: get
     uri: http://iss.ndl.go.jp/books/R100000002-I000007602726-00.rdf
@@ -120,7 +120,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Fri, 01 Jun 2012 00:05:08 GMT
+      - Sat, 02 Jun 2012 13:40:23 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -130,7 +130,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.406517"
+      - "0.886560"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -140,8 +140,8 @@ http_interactions:
       content-type: 
       - application/rdf+xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=27b1944a32962a13f3e8284d0e281ea8; domain=.iss.ndl.go.jp; path=/; expires=Fri, 01-Jun-2012 01:05:08 GMT; HttpOnly
-      - serverid=1105; path=/
+      - _front_session_id=f2df568d1169394863f7ae3973585aa4; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 14:40:24 GMT; HttpOnly
+      - serverid=1101; path=/
       vary: 
       - Accept-Encoding,User-Agent
       connection: 
@@ -519,5 +519,5 @@ http_interactions:
         dGlvbj4KICA8L2RjbmRsOkl0ZW0+CjwvcmRmOlJERj4=
 
     http_version: "1.0"
-  recorded_at: Fri, 01 Jun 2012 00:05:08 GMT
+  recorded_at: Sat, 02 Jun 2012 13:40:24 GMT
 recorded_with: VCR 2.2.0

data/spec/cassette_library/enju_ndl/ndl_search.yml

@@ -17,7 +17,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Wed, 06 Jun 2012 00:47:18 GMT
+      - Sat, 02 Jun 2012 14:18:10 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -27,7 +27,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.159748"
+      - "0.159388"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -37,7 +37,7 @@ http_interactions:
       content-type: 
       - application/xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=6cbce8417ee4d4abc56ba0833e296639; domain=.iss.ndl.go.jp; path=/; expires=Wed, 06-Jun-2012 01:47:18 GMT; HttpOnly
+      - _front_session_id=5170aa59dc71a4b1408f4b5001e315c3; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 15:18:10 GMT; HttpOnly
       - serverid=1105; path=/
       vary: 
       - Accept-Encoding,User-Agent
@@ -103,7 +103,7 @@ http_interactions:
         dGlvbj4KICAgIDwvaXRlbT4KICA8L2NoYW5uZWw+CjwvcnNzPgo=
 
     http_version: "1.0"
-  recorded_at: Wed, 06 Jun 2012 00:47:20 GMT
+  recorded_at: Sat, 02 Jun 2012 14:18:10 GMT
 - request: 
     method: get
     uri: http://iss.ndl.go.jp/books/R100000002-I000009423883-00.rdf
@@ -121,7 +121,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Wed, 06 Jun 2012 00:47:19 GMT
+      - Sat, 02 Jun 2012 14:18:10 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -131,7 +131,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.744922"
+      - "0.836118"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -141,7 +141,7 @@ http_interactions:
       content-type: 
       - application/rdf+xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=fef35c7dea106d383888b8651402db4c; domain=.iss.ndl.go.jp; path=/; expires=Wed, 06-Jun-2012 01:47:19 GMT; HttpOnly
+      - _front_session_id=b364b1688e10e7bf73c43a9bacc873f3; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 15:18:11 GMT; HttpOnly
       - serverid=1102; path=/
       vary: 
       - Accept-Encoding,User-Agent
@@ -574,7 +574,7 @@ http_interactions:
         Y3JpcHRpb24+CiAgPC9kY25kbDpJdGVtPgo8L3JkZjpSREY+
 
     http_version: "1.0"
-  recorded_at: Wed, 06 Jun 2012 00:47:21 GMT
+  recorded_at: Sat, 02 Jun 2012 14:18:11 GMT
 - request: 
     method: get
     uri: http://iss.ndl.go.jp/api/opensearch?dpid=iss-ndl-opac&isbn=9784873114422&cnt=10&idx=1
@@ -592,7 +592,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Thu, 07 Jun 2012 12:39:42 GMT
+      - Sat, 02 Jun 2012 15:28:30 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -602,7 +602,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.118518"
+      - "0.086686"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -612,8 +612,8 @@ http_interactions:
       content-type: 
       - application/xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=5bf7f7538d18506400e1081810dc1c1c; domain=.iss.ndl.go.jp; path=/; expires=Thu, 07-Jun-2012 13:39:42 GMT; HttpOnly
-      - serverid=1102; path=/
+      - _front_session_id=dfdbd2213e07e3aa4dbb75a35d02e1da; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 16:28:30 GMT; HttpOnly
+      - serverid=1101; path=/
       vary: 
       - Accept-Encoding,User-Agent
       connection: 
@@ -679,7 +679,7 @@ http_interactions:
         Y3JpcHRpb24+CiAgICA8L2l0ZW0+CiAgPC9jaGFubmVsPgo8L3Jzcz4K
 
     http_version: "1.0"
-  recorded_at: Thu, 07 Jun 2012 12:39:43 GMT
+  recorded_at: Sat, 02 Jun 2012 15:28:30 GMT
 - request: 
     method: get
     uri: http://iss.ndl.go.jp/books/R100000002-I000010712584-00.rdf
@@ -697,7 +697,7 @@ http_interactions:
       message: OK
     headers: 
       date: 
-      - Thu, 07 Jun 2012 12:39:42 GMT
+      - Sat, 02 Jun 2012 15:28:30 GMT
       server: 
       - Apache
       x-powered-by: 
@@ -707,7 +707,7 @@ http_interactions:
       x-ua-compatible: 
       - IE=Edge,chrome=1
       x-runtime: 
-      - "0.918968"
+      - "0.892157"
       cache-control: 
       - max-age=0, private, must-revalidate
       content-length: 
@@ -717,8 +717,8 @@ http_interactions:
       content-type: 
       - application/rdf+xml; charset=utf-8
       set-cookie: 
-      - _front_session_id=0ea752e083d0c700c523bbee26d499fc; domain=.iss.ndl.go.jp; path=/; expires=Thu, 07-Jun-2012 13:39:43 GMT; HttpOnly
-      - serverid=1105; path=/
+      - _front_session_id=26fdffc6b12b561c67c3656670a6d93c; domain=.iss.ndl.go.jp; path=/; expires=Sat, 02-Jun-2012 16:28:31 GMT; HttpOnly
+      - serverid=1101; path=/
       vary: 
       - Accept-Encoding,User-Agent
       connection: 
@@ -1136,5 +1136,5 @@ http_interactions:
         PC9yZGY6UkRGPg==
 
     http_version: "1.0"
-  recorded_at: Thu, 07 Jun 2012 12:39:44 GMT
+  recorded_at: Sat, 02 Jun 2012 15:28:31 GMT
 recorded_with: VCR 2.2.0

data/spec/dummy/app/mailers/notifier.rb

@@ -1,4 +1,5 @@
 class Notifier < ActionMailer::Base
+  include Resque::Mailer
   if LibraryGroup.site_config.try(:url)
     uri = Addressable::URI.parse(LibraryGroup.site_config.url)
     default_url_options[:host] = uri.host
@@ -8,7 +9,8 @@ class Notifier < ActionMailer::Base
     default_url_options[:port] = configatron.enju.web_port_number if configatron.enju.web_port_number != 80
   end
 
-  def message_notification(message)
+  def message_notification(message_id)
+    message = Message.find(message_id)
     I18n.locale = message.receiver.locale.try(:to_sym) || I18n.default_locale
     from = "#{LibraryGroup.system_name(message.receiver.locale)} <#{LibraryGroup.site_config.email}>"
     if message.subject
@@ -26,7 +28,9 @@ class Notifier < ActionMailer::Base
     mail(:from => from, :to => message.receiver.email, :subject => subject)
   end
 
-  def manifestation_info(user, manifestation)
+  def manifestation_info(user_id, manifestation_id)
+    user = User.find(user_id)
+    manifestation = Manifestation.find(manifestation_id)
     from = "#{LibraryGroup.system_name(user.locale)} <#{LibraryGroup.site_config.email}>"
     subject = "#{manifestation.original_title} : #{LibraryGroup.system_name(user.locale)}"
     @user = user

data/spec/dummy/config/initializers/resque_mailer.rb

@@ -0,0 +1 @@
+Resque::Mailer.excluded_environments = [:test, :cucumber]

data/spec/dummy/lib/enju_leaf.rb

@@ -1,6 +1,4 @@
 require 'plugins'
-require 'enju_leaf/sru'
-require 'enju_leaf/openurl'
 require 'enju_leaf/calculate_stat'
 require 'enju_library'
 require 'enju_circulation'

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/isbn_sample.txt

@@ -0,0 +1,3 @@
+isbn	library_short_name
+invalid
+9784873113647

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/item_delete_file.tsv

@@ -0,0 +1,11 @@
+"item_identifier"
+"00001"
+"00002"
+"00003"
+"00004"
+"00005"
+"00006"
+"00007"
+"00008"
+"00009"
+"00010"

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/item_update_file.tsv

@@ -0,0 +1,4 @@
+item_identifier	original_title	creator	publisher	subject	acquired_at
+"00001"		たなべ// こうすけ	test1	test1// test2	
+"00002"			test2		
+"00003"	テスト3				2012-01-01

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv

@@ -0,0 +1,19 @@
+manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
+資料ID	タイトル	注記	タイトルよみ	代替タイトル	定期刊行物フラグ	シリーズ番号	シリーズタイトル	シリーズタイトルよみ	著者	著者よみ	出版者	出版者よみ	出版日	巻	版	isbn	issn	販売価格	受入価格	高さ	書架名	個別資料ID	nbn	lccn	件名			インポート省略
+	test1	○ identifierなし、item_identifierなし							test	てすと	test2			invalid														
+	test2	○ identifierなし、item_identifierあり							test||author//test1||illustrator				2001									10101				Public fund	Example store	
+101	test3	× ダミー							test		test2															Public fund	Example store	適当な値
+101	test3	○ identifierあり、item_identifierなし					主シリーズ//副シリーズ//1	しゅしりーず//ふくしりーず//いち	test		test2																	
+102	test4	○ identifierあり、item_identifierあり							test1		test		2001-1									10102						
+101	“test 5”	△ identifier重複、item_identifier非重複							test1||author//test2||illustrator	てすと1//てすと2	test											10103					Example store	
+102	test6	× identifier重複、item_identifier重複							test		test3											10101						
+	test7	○ ISBN不正、タイトルあり、所蔵情報あり											2001-1-1			9000000000000					first_shelf	10104				Public fund		
+		× ISBN不正、タイトルなし														22222222						10105						
+	test8	○ ISBNなし、所蔵情報あり							test		test4//test5	てすと4//てすと5						1000	0		first_shelf	11111						
+	test9	× item_identifier重複																				11111						
+		○ ISBN重複（シリーズ情報あり）、item_identifierなし														4798002062												
+		△ ISBN重複（シリーズ情報なし）、item_identifier非重複														4798002062						11112						
+		× ISBN重複、item_identifier重複														4798002062						11111						
+		× ISBN重複（13桁）、item_identifierなし														978-4798002064												
+103	"ダブル""クォート""を含む資料"	○ ダブルクォートを含む資料																										
+104	test10	○ TSV中にタイトルがあれば他の項目もTSVファイル優先							test3		test4					4797327030												

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv

@@ -0,0 +1,19 @@
+manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
+����ID	�^�C�g��	���L	�^�C�g�����	��փ^�C�g��	������s���t���O	�V���[�Y�ԍ�	�V���[�Y�^�C�g��	�V���[�Y�^�C�g�����	����	���҂��	�o�Ŏ�	�o�Ŏ҂��	�o�œ�	��	��	isbn	issn	�̔����i	������i	����	���˖�	�•ʎ���ID	nbn	lccn	����			�C���|�[�g�ȗ�
+	test1	�� identifier�Ȃ��Aitem_identifier�Ȃ�							test	�Ă���	test2			invalid														
+	test2	�� identifier�Ȃ��Aitem_identifier����							test||author//test1||illustrator				2001									10101				Public fund	Example store	
+101	test3	�~ �_�~�[							test		test2															Public fund	Example store	�K���Ȓl
+101	test3	�� identifier����Aitem_identifier�Ȃ�					��V���[�Y//���V���[�Y//1	���サ��[��//�ӂ�����[��//����	test		test2																	
+102	test4	�� identifier����Aitem_identifier����							test1		test		2001-1									10102						
+101	�gtest 5�h	�� identifier�d���Aitem_identifier��d��							test1||author//test2||illustrator	����1//����2	test											10103					Example store	
+102	test6	�~ identifier�d���Aitem_identifier�d��							test		test3											10101						
+	test7	�� ISBN�s���A�^�C�g������A������񂠂�											2001-1-1			9000000000000					first_shelf	10104				Public fund		
+		�~ ISBN�s���A�^�C�g���Ȃ�														22222222						10105						
+	test8	�� ISBN�Ȃ��A������񂠂�							test		test4//test5	�Ă���4//�Ă���5						1000	0		first_shelf	11111						
+	test9	�~ item_identifier�d��																				11111						
+		�� ISBN�d���i�V���[�Y��񂠂�j�Aitem_identifier�Ȃ�														4798002062												
+		�� ISBN�d���i�V���[�Y���Ȃ��j�Aitem_identifier��d��														4798002062						11112						
+		�~ ISBN�d���Aitem_identifier�d��														4798002062						11111						
+		�~ ISBN�d���i13���j�Aitem_identifier�Ȃ�														978-4798002064												
+103	"�_�u��""�N�H�[�g""���܂ގ���"	�� �_�u���N�H�[�g���܂ގ���																										
+104	test10	�� TSV���Ƀ^�C�g��������Α��̍��ڂ�TSV�t�@�C���D��							test3		test4					4797327030												

data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/update_series_statement.tsv

@@ -0,0 +1,2 @@
+manifestation_id	series_statement_id
+10	2

data/spec/dummy/solr/conf/schema.xml

@@ -60,7 +60,12 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
+      <analyzer type="index" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+      <analyzer type="query" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -235,4 +240,5 @@
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
         or to add multiple fields to the same field for easier/faster searching.  -->
+  <copyField source="*_text" dest="text" />
 </schema>

data/spec/dummy/solr/data/test/index/_h.fnm

@@ -0,0 +1,5 @@
+����idtype
+class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
+language_screated_at_dupdated_at_ddate_of_publication_dmsort_date_of_publication_drequired_role_id_irepository_content_bsort_title_speriodical_bperiodical_master_breservable_b
+title_text
textbtitle_text
	isbn_text
volume_number_imissue_number_impatron_type_id_i	name_text

+position_imanifestation_ids_imseries_statement_id_i

data/spec/dummy/solr/data/test/index/_h.nrm

@@ -0,0 +1 @@
+NRM�||t|||||y|y||t|||||y|y���||�||�|�|||qu||||||

data/spec/fixtures/manifestations.yml

@@ -411,7 +411,7 @@ manifestation_00114:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2001-03-20
+  pub_date: 2001-03-20
   access_address:
   id: 114
   height:
@@ -441,7 +441,7 @@ manifestation_00116:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 1991-12-24
+  pub_date: 1991-12-24
   access_address:
   id: 116
   height:
@@ -501,7 +501,7 @@ manifestation_00120:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2000-10-01
+  pub_date: 2000-10-01
   access_address:
   id: 120
   height:
@@ -1581,7 +1581,7 @@ manifestation_00192:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2007-04-27
+  pub_date: 2007-04-27
   access_address:
   id: 192
   height:
@@ -1597,7 +1597,7 @@ manifestation_00193:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2007-02-01
+  pub_date: 2007-02-01
   access_address:
   id: 193
   height:
@@ -1642,7 +1642,7 @@ manifestation_00196:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2006-08-05
+  pub_date: 2006-08-05
   access_address:
   id: 196
   height:

data/spec/models/manifestation_spec.rb

@@ -18,6 +18,13 @@ describe Manifestation, :solr => true do
     manifestation.date_of_publication.should eq Time.zone.parse('2000-01-01')
   end
 
+  it "should set volume_number" do
+    manifestation = FactoryGirl.create(:manifestation, :volume_number_string => '第1巻', :issue_number_string => '20号分冊1', :edition_string => '第3版')
+    manifestation.volume_number.should eq 1
+    manifestation.issue_number.should eq 20
+    manifestation.edition.should eq 3
+  end
+
   it "should search title in openurl" do
     openurl = Openurl.new({:title => "プログラミング"})
     results = openurl.search
@@ -140,7 +147,7 @@ describe Manifestation, :solr => true do
     #TODO ソート基準が入手しやすさの場合の処理
   end
 
-  it "should accept rangs in sru" do
+  it "should accept ranges in sru" do
     sru = Sru.new({:query => "from = 1993-02-24 AND until = 2006-08-06 AND title=プログラミング"})
     sru.search
     sru.manifestations.size.should eq 2