enju_biblio 0.1.0.pre33 → 0.1.0.pre34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/manifestations_controller.rb +6 -27
- data/app/controllers/series_has_manifestations_controller.rb +2 -2
- data/app/controllers/series_statements_controller.rb +1 -17
- data/app/models/enju_biblio/ability.rb +2 -2
- data/app/models/item.rb +2 -3
- data/app/models/manifestation.rb +109 -163
- data/app/models/page_sweeper.rb +1 -3
- data/app/models/resource_import_file.rb +26 -62
- data/app/models/series_statement.rb +35 -76
- data/app/views/manifestations/_form.html.erb +9 -24
- data/app/views/manifestations/_manifestation.html.erb +5 -5
- data/app/views/manifestations/_show_detail_librarian.html.erb +6 -2
- data/app/views/manifestations/_show_detail_user.html.erb +6 -2
- data/app/views/manifestations/_show_index.html.erb +3 -8
- data/app/views/manifestations/_show_periodical_master.html.erb +6 -23
- data/app/views/manifestations/_show_series_index.html.erb +1 -9
- data/app/views/manifestations/show.html.erb +1 -1
- data/app/views/series_statements/_form.html.erb +0 -8
- data/app/views/series_statements/_index.html.erb +3 -17
- data/app/views/series_statements/_index_manifestation.html.erb +0 -15
- data/app/views/series_statements/_index_parent.html.erb +0 -2
- data/app/views/series_statements/_index_series_statement_merge_list.html.erb +0 -2
- data/app/views/series_statements/_manifestation_list.html.erb +1 -1
- data/app/views/series_statements/show.html.erb +0 -9
- data/config/locales/translation_en.yml +1 -0
- data/config/locales/translation_ja.yml +1 -0
- data/db/migrate/20130421093852_add_periodical_to_manifestation.rb +5 -0
- data/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
- data/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
- data/lib/enju_biblio/version.rb +1 -1
- data/spec/cassette_library/ImportRequest/import/should_import_bibliographic_record.yml +49 -47
- data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/redirects_to_the_created_import_request.yml +624 -0
- data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +624 -0
- data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml +624 -0
- data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml +624 -0
- data/spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml +624 -0
- data/spec/controllers/import_requests_controller_spec.rb +29 -31
- data/spec/controllers/manifestations_controller_spec.rb +5 -37
- data/spec/dummy/app/models/ability.rb +2 -2
- data/spec/dummy/config/application.rb +0 -1
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/schema.rb +10 -7
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +1 -1
- data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv +1 -1
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/segments_gs2 +0 -0
- data/spec/dummy/tmp/cache/4AD/470/country_all +0 -0
- data/spec/fixtures/items.yml +2 -3
- data/spec/fixtures/manifestations.yml +72 -72
- data/spec/fixtures/series_statements.yml +21 -23
- data/spec/models/item_spec.rb +26 -28
- data/spec/models/manifestation_spec.rb +80 -76
- data/spec/models/resource_import_file_spec.rb +33 -9
- data/spec/models/series_statement_spec.rb +22 -34
- metadata +22 -25
- data/app/views/series_statements/_periodical_facet.html.erb +0 -15
- data/db/migrate/20110425133109_add_issn_to_series_statement.rb +0 -9
- data/db/migrate/20110618091240_add_periodical_to_series_statement.rb +0 -9
- data/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb +0 -13
- data/spec/dummy/solr/data/test/index/segments_6n6 +0 -0
@@ -5,7 +5,6 @@
|
|
5
5
|
|
6
6
|
<h2 class="resource_title">
|
7
7
|
<%= @series_statement.original_title %>
|
8
|
-
<%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) if @series_statement.periodical -%>
|
9
8
|
</h2>
|
10
9
|
|
11
10
|
<div id="tabs">
|
@@ -24,14 +23,6 @@
|
|
24
23
|
<% end %>
|
25
24
|
</td>
|
26
25
|
</tr>
|
27
|
-
<tr>
|
28
|
-
<td><%= t('activerecord.attributes.series_statement.periodical') -%></td>
|
29
|
-
<td><%= localized_boolean(@series_statement.periodical) %></td>
|
30
|
-
</tr>
|
31
|
-
<tr>
|
32
|
-
<td><%= t('activerecord.attributes.series_statement.issn') -%></td>
|
33
|
-
<td><%= @series_statement.issn %></td>
|
34
|
-
</tr>
|
35
26
|
<tr>
|
36
27
|
<td><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></td>
|
37
28
|
<td><%= @series_statement.series_statement_identifier %></td>
|
@@ -0,0 +1,7 @@
|
|
1
|
+
class AddCreatorStringToSeriesStatement < ActiveRecord::Migration
|
2
|
+
def change
|
3
|
+
add_column :series_statements, :creator_string, :text
|
4
|
+
add_column :series_statements, :volume_number_string, :text
|
5
|
+
add_column :series_statements, :volume_number_transcription_string, :text
|
6
|
+
end
|
7
|
+
end
|
data/lib/enju_biblio/version.rb
CHANGED
@@ -18,36 +18,36 @@ http_interactions:
|
|
18
18
|
code: 200
|
19
19
|
message: OK
|
20
20
|
headers:
|
21
|
-
date:
|
22
|
-
- Wed, 10 Apr 2013 04:25:06 GMT
|
23
|
-
server:
|
24
|
-
- Apache
|
25
|
-
x-powered-by:
|
26
|
-
- Phusion Passenger (mod_rails/mod_rack) 2.2.15
|
27
|
-
etag:
|
28
|
-
- '"227e9ca7cb520002ea44415cf39872d7"'
|
29
|
-
x-ua-compatible:
|
30
|
-
- IE=Edge,chrome=1
|
31
|
-
x-runtime:
|
32
|
-
- '0.146385'
|
33
21
|
cache-control:
|
34
22
|
- max-age=0, private, must-revalidate
|
35
|
-
|
36
|
-
- '
|
23
|
+
content-length:
|
24
|
+
- '2700'
|
37
25
|
content-type:
|
38
26
|
- application/xml; charset=utf-8
|
27
|
+
date:
|
28
|
+
- Fri, 19 Apr 2013 04:44:49 GMT
|
29
|
+
etag:
|
30
|
+
- '"227e9ca7cb520002ea44415cf39872d7"'
|
31
|
+
proxy-connection:
|
32
|
+
- keep-alive
|
33
|
+
server:
|
34
|
+
- Apache
|
39
35
|
set-cookie:
|
40
|
-
- _front_session_id=
|
41
|
-
path=/; expires=
|
36
|
+
- _front_session_id=3890c1b81915a3f188347c2a43d28611; domain=.iss.ndl.go.jp;
|
37
|
+
path=/; expires=Fri, 19-Apr-2013 05:44:53 GMT; HttpOnly
|
42
38
|
- serverid=1101; path=/
|
39
|
+
status:
|
40
|
+
- '200'
|
43
41
|
vary:
|
44
42
|
- Accept-Encoding,User-Agent
|
45
|
-
|
46
|
-
-
|
47
|
-
|
48
|
-
-
|
49
|
-
|
50
|
-
-
|
43
|
+
via:
|
44
|
+
- 1.0 webwasher (Webwasher 6.9.1.12571)
|
45
|
+
x-powered-by:
|
46
|
+
- Phusion Passenger (mod_rails/mod_rack) 2.2.15
|
47
|
+
x-runtime:
|
48
|
+
- '1.861414'
|
49
|
+
x-ua-compatible:
|
50
|
+
- IE=Edge,chrome=1
|
51
51
|
body:
|
52
52
|
encoding: ASCII-8BIT
|
53
53
|
string: !binary |-
|
@@ -111,8 +111,8 @@ http_interactions:
|
|
111
111
|
44GC44KKPC9kY3Rlcm1zOmRlc2NyaXB0aW9uPgogICAgICA8cmRmczpzZWVB
|
112
112
|
bHNvIHJkZjpyZXNvdXJjZT0iaHR0cDovL2lkLm5kbC5nby5qcC9iaWIvMDAw
|
113
113
|
MDA5ODk5MzQ2Ii8+CiAgICA8L2l0ZW0+CiAgPC9jaGFubmVsPgo8L3Jzcz4K
|
114
|
-
http_version: '1.
|
115
|
-
recorded_at:
|
114
|
+
http_version: '1.1'
|
115
|
+
recorded_at: Fri, 19 Apr 2013 04:44:56 GMT
|
116
116
|
- request:
|
117
117
|
method: get
|
118
118
|
uri: http://iss.ndl.go.jp/books/R100000002-I000009899346-00.rdf
|
@@ -131,34 +131,36 @@ http_interactions:
|
|
131
131
|
code: 200
|
132
132
|
message: OK
|
133
133
|
headers:
|
134
|
+
cache-control:
|
135
|
+
- max-age=0, private, must-revalidate
|
136
|
+
content-type:
|
137
|
+
- text/xml; charset=utf-8
|
134
138
|
date:
|
135
|
-
-
|
136
|
-
server:
|
137
|
-
- Apache
|
138
|
-
x-powered-by:
|
139
|
-
- Phusion Passenger (mod_rails/mod_rack) 2.2.15
|
139
|
+
- Fri, 19 Apr 2013 04:44:53 GMT
|
140
140
|
etag:
|
141
141
|
- '"0d9160cca47c40e60be448a33dfefaed"'
|
142
|
-
|
143
|
-
-
|
144
|
-
|
145
|
-
-
|
146
|
-
|
147
|
-
-
|
142
|
+
proxy-connection:
|
143
|
+
- keep-alive
|
144
|
+
server:
|
145
|
+
- Apache
|
146
|
+
set-cookie:
|
147
|
+
- _front_session_id=e18fadc8622e714e0d21d088d328bcce; domain=.iss.ndl.go.jp;
|
148
|
+
path=/; expires=Fri, 19-Apr-2013 05:44:54 GMT; HttpOnly
|
149
|
+
- serverid=1102; path=/
|
148
150
|
status:
|
149
151
|
- '200'
|
150
|
-
|
151
|
-
-
|
152
|
-
set-cookie:
|
153
|
-
- _front_session_id=32ded44456b1099be525c6fd61968113; domain=.iss.ndl.go.jp;
|
154
|
-
path=/; expires=Wed, 10-Apr-2013 05:25:07 GMT; HttpOnly
|
155
|
-
- serverid=1105; path=/
|
152
|
+
transfer-encoding:
|
153
|
+
- chunked
|
156
154
|
vary:
|
157
155
|
- Accept-Encoding,User-Agent
|
158
|
-
|
159
|
-
-
|
160
|
-
|
161
|
-
-
|
156
|
+
via:
|
157
|
+
- 1.0 webwasher (Webwasher 6.9.1.12571)
|
158
|
+
x-powered-by:
|
159
|
+
- Phusion Passenger (mod_rails/mod_rack) 2.2.15
|
160
|
+
x-runtime:
|
161
|
+
- '0.862473'
|
162
|
+
x-ua-compatible:
|
163
|
+
- IE=Edge,chrome=1
|
162
164
|
body:
|
163
165
|
encoding: ASCII-8BIT
|
164
166
|
string: !binary |-
|
@@ -637,6 +639,6 @@ http_interactions:
|
|
637
639
|
bGFiaWxpdHk+CiAgICA8ZGN0ZXJtczpkZXNjcmlwdGlvbj7phY3nva7loLTm
|
638
640
|
iYAgOiDplovmnrbplrLopqflrqQ8L2RjdGVybXM6ZGVzY3JpcHRpb24+CiAg
|
639
641
|
PC9kY25kbDpJdGVtPgo8L3JkZjpSREY+
|
640
|
-
http_version: '1.
|
641
|
-
recorded_at:
|
642
|
+
http_version: '1.1'
|
643
|
+
recorded_at: Fri, 19 Apr 2013 04:44:57 GMT
|
642
644
|
recorded_with: VCR 2.4.0
|