enju_biblio 0.1.0.pre69 → 0.1.0.pre70

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

@@ -27,11 +27,7 @@
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>
-  <script type="text/javascript">
-    $(document).ready(function(){
-      $("a[rel='manifestation_<%= @manifestation.id -%>']").colorbox({transition:"none", photo:true});
-    })
-  </script>
+  <%= render 'manifestations/colorbox' %>
   <%- if user_signed_in? -%>
     <div id="call_number_content">
       <%- @manifestation.items.on_shelf.each do |item| -%>
@@ -78,5 +74,6 @@
       <%- if current_user.try(:has_role?, 'Librarian') -%>
         <%= render 'manifestations/edit_detail' %>
       <% end %>
+      <%= render 'manifestations/export_detail' %>
   </div>
 </div>

data/app/views/manifestations/show.txt.erb

@@ -0,0 +1,2 @@
+manifestation_identifier	original_title	creator	publisher	isbn	pub_date	note
+<%= render @manifestation %>

data/app/views/resource_import_files/_results.html.erb

@@ -0,0 +1,23 @@
+<h2><%= t('activerecord.models.resource_import_result') %></h2>
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.resource_import_result.lineno') %></th>
+    <th><%= t('activerecord.attributes.resource_import_result.body') %></th>
+    <th><%= t('activerecord.models.manifestation') %></th>
+    <th><%= t('activerecord.models.item') %></th>
+    <th></th>
+  </tr>
+<% @resource_import_results.each_with_index do |resource_import_result, idx| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= @resource_import_results.offset_value + idx + 1 %></td>
+    <td><%= resource_import_result.body.inspect.truncate(100) %></td>
+    <td><%= link_to resource_import_result.manifestation.original_title, resource_import_result.manifestation if resource_import_result.manifestation %></td>
+    <td><%= link_to resource_import_result.item.item_identifier, resource_import_result.item if resource_import_result.item %></td>
+    <td>
+      <%= link_to t('page.show'), resource_import_result %>
+      <%= link_to t('page.destroy'), resource_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>
+<%= paginate(@resource_import_results) %>

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

@@ -18,8 +18,10 @@
     <%= f.label :edit_mode, t('page.update'), value: 'update' %>
     <%= f.radio_button :edit_mode, 'update_relationship' %>
     <%= f.label :edit_mode, t('resource_import_file.update_relationship'), value: 'update_relationship' %>
+    <!--
     <%= f.radio_button :edit_mode, 'destroy' %>
     <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
+    -->
   </div>
 
   <div class="field">

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

@@ -10,12 +10,10 @@
 
 <p>
   <strong><%= t('activerecord.attributes.resource_import_file.resource_import_file_name') -%>:</strong>
-  <%= link_to @resource_import_file.resource_import_file_name, resource_import_file_path(@resource_import_file, format: :download) if @resource_import_file.resource_import_file_name %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.resource_import_file.resource_import_content_type') -%>:</strong>
-  <%= @resource_import_file.resource_import_content_type -%>
+  <% if @resource_import_file.resource_import_file_name %>
+    <%= link_to @resource_import_file.resource_import_file_name, resource_import_file_path(@resource_import_file, format: :download) %>
+    (<%= @resource_import_file.resource_import_content_type -%>)
+  <% end %>
 </p>
 
 <p>
@@ -23,11 +21,6 @@
   <%= @resource_import_file.resource_import_file_size -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.resource_import_file.resource_import_fingerprint') -%>:</strong>
-  <%= @resource_import_file.resource_import_fingerprint -%>
-</p>
-
 <p>
   <strong><%= t('page.created_at') -%>:</strong>
   <%= l(@resource_import_file.created_at) if @resource_import_file.created_at -%>
@@ -77,13 +70,16 @@
   <%= link_to @resource_import_file.user.username, @resource_import_file.user.profile if @resource_import_file.user.try(:profile) -%>
 </p>
 
+<% if @resource_import_results %>
+  <%= render 'results' %>
+<% end %>
+
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@resource_import_file) do |f| %>
   <ul>
-    <li><%= link_to t('activerecord.models.resource_import_result'), resource_import_results_path(resource_import_file_id: @resource_import_file.id) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <% if current_user.has_role?('Administrator') %>
       <li><%= link_to 'Resque', resque_path %></li>

data/app/views/resource_import_results/_list.html.erb

@@ -0,0 +1,26 @@
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.models.resource_import_file') %></th>
+    <th><%= t('activerecord.models.manifestation') %></th>
+    <th><%= t('activerecord.models.item') %></th>
+    <th></th>
+  </tr>
+
+<% @resource_import_results.each do |resource_import_result| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td>
+      <%= link_to resource_import_result.resource_import_file.resource_import_file_name, resource_import_result.resource_import_file if resource_import_result.resource_import_file %>
+      <br />
+      <%=l resource_import_result.created_at %>
+      <br />
+      <%= resource_import_result.error_message %>
+    </td>
+    <td><%= link_to resource_import_result.manifestation.original_title, resource_import_result.manifestation if resource_import_result.manifestation %></td>
+    <td><%= link_to resource_import_result.item.item_identifier, resource_import_result.item if resource_import_result.item %></td>
+    <td>
+      <%= link_to t('page.show'), resource_import_result %>
+      <%= link_to t('page.destroy'), resource_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>

data/app/views/resource_import_results/_list_lines.html.erb

@@ -0,0 +1,25 @@
+<ul>
+  <li><%= t('activerecord.models.resource_import_file') %>: <%= link_to @resource_import_file.resource_import_file_name, @resource_import_file %>
+  <li><%= t('page.created_at') %>: <%= l(@resource_import_file.created_at) %>
+</h2>
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.resource_import_result.lineno') %></th>
+    <th><%= t('activerecord.attributes.resource_import_result.body') %></th>
+    <th><%= t('activerecord.models.manifestation') %></th>
+    <th><%= t('activerecord.models.item') %></th>
+    <th></th>
+  </tr>
+<% @resource_import_results.each_with_index do |resource_import_result, idx| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= @resource_import_results.offset_value + idx + 1 %></td>
+    <td><%= resource_import_result.body.inspect.truncate(100) %></td>
+    <td><%= link_to resource_import_result.manifestation.original_title, resource_import_result.manifestation if resource_import_result.manifestation %></td>
+    <td><%= link_to resource_import_result.item.item_identifier, resource_import_result.item if resource_import_result.item %></td>
+    <td>
+      <%= link_to t('page.show'), resource_import_result %>
+      <%= link_to t('page.destroy'), resource_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>

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

@@ -2,38 +2,11 @@
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.resource_import_result')) -%></h1>
 <div id="content_list">
   <% if @resource_import_file %>
-    <h2 class="resource_title">
-      <%= link_to @resource_import_file.resource_import_file_name, @resource_import_file %>
-    </h2>
+    <%= render "list_lines" %>
+  <% else %>
+    <%= render "list" %>
   <% end %>
 
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.models.resource_import_file') %></th>
-    <th><%= t('activerecord.models.manifestation') %></th>
-    <th><%= t('activerecord.models.item') %></th>
-    <th></th>
-  </tr>
-
-<% @resource_import_results.each do |resource_import_result| %>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td>
-      <%= link_to resource_import_result.resource_import_file.resource_import_file_name, resource_import_result.resource_import_file %>
-      <br />
-      <%=l resource_import_result.created_at %>
-      <br />
-      <%= resource_import_result.error_message %>
-    </td>
-    <td><%= link_to resource_import_result.manifestation.original_title, resource_import_result.manifestation if resource_import_result.manifestation %></td>
-    <td><%= link_to resource_import_result.item.item_identifier, resource_import_result.item if resource_import_result.item %></td>
-    <td>
-      <%= link_to t('page.show'), resource_import_result %>
-      <%= link_to t('page.destroy'), resource_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
-    </td>
-  </tr>
-<% end %>
-</table>
-
 <%= paginate(@resource_import_results) %>
 
 </div>

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

@@ -5,7 +5,7 @@
 
 <p>
   <b><%= t('activerecord.models.resource_import_file') %></b>
-  <%= @resource_import_result.resource_import_file.resource_import_file_name %>
+  <%= @resource_import_result.resource_import_file.try(:resource_import_file_name) %>
 </p>
 
 <p>

data/config/locales/translation_en.yml

@@ -39,14 +39,14 @@ en:
       resource_export_file: Resource export
       agent_export_file: Agent export
       agent_merge_list: Patron merge list
-      agent_merge: Patrom merge
+      agent_merge: Patron merge
       series_statement_merge: Series statement merge
       series_statement_merge_list: Series statement merge list
 
     attributes:
       manifestation:
         original_title: Original title
-        title_alternative: Titlte alternative
+        title_alternative: Title alternative
         title_transcription: Title transcription
         classification_number: Classification number
         manifestation_identifier: Local manifestation identifier
@@ -296,6 +296,7 @@ en:
       resource_import_result:
         body: Body
         error_message: Error message
+        lineno: Line
       agent_import_result:
         body: Body
       create_type:
@@ -338,7 +339,7 @@ en:
     contributor: Contributor
     publisher: Publisher
     library_group_agent: "Agents of %{library_group_name}"
-    work_agent: "Creaters of %{work_title}"
+    work_agent: "Creators of %{work_title}"
     expression_agent: "Realizers of %{expression_title}"
     manifestation_agent: "Producers of %{manifestation_title}"
     activate_as_user: "Activate as an user"
@@ -348,7 +349,7 @@ en:
     recent_publication: "Recent publications"
     all_publication: "All publications"
     other_address: "The other address"
-    add_derivation: "Add derivatation"
+    add_derivation: "Add derivation"
     creator: "Creator"
     contributor: "Contributor"
     publisher: "Publisher"
@@ -373,7 +374,7 @@ en:
     serial: "Serial"
     number: "Number"
     invalid_isbn: "Invalid ISBN."
-    already_imported: "This manifestation is already imporeted."
+    already_imported: "This manifestation is already imported."
     record_not_found: "Record not found."
     add: "Add a manifestation"
     specify_expression: "Specify the expression."
@@ -422,3 +423,5 @@ en:
   import:
     manifestation_found: 'Manifestation skipped: This manifestation is already created.'
     item_found: 'Item skipped: This item is already created.'
+    isbn_invalid: "ISBN import error: ISBN string is invalid."
+    isbn_record_not_found: "ISBN import error: Bibliographic record is not found in the external service."

data/config/locales/translation_ja.yml

@@ -130,7 +130,7 @@ ja:
         corporate_name_transcription: 企業名（ヨミ）
         full_name: フルネーム
         full_name_transcription: フルネーム（ヨミ）
-        full_name_alternative: フルネーム代替
+        full_name_alternative: フルネーム（代替）
         deleted_at: 削除時刻
         zip_code_1: 郵便番号1
         zip_code_2: 郵便番号2
@@ -296,6 +296,7 @@ ja:
       resource_import_result:
         body: 本文
         error_message: エラーメッセージ
+        lineno: 行数
       agent_import_result:
         body: 本文
       create_type:
@@ -426,3 +427,5 @@ ja:
   import:
     manifestation_found: "書誌インポート省略: すでに登録されている書誌が見つかりました。"
     item_found: "所蔵インポート省略: すでに登録されている個別資料が見つかりました。"
+    isbn_invalid: "ISBNインポートエラー: ISBNは不正な値です。"
+    isbn_record_not_found: "ISBNインポートエラー: 外部サービスにおいてISBNに該当する書誌データが見つかりませんでした。"

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre69"
+  VERSION = "0.1.0.pre70"
 end

data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/ISBN_import/with_record_not_found/should_record_an_error_message.yml

@@ -0,0 +1,155 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://iss.ndl.go.jp/api/opensearch?cnt=10&dpid=iss-ndl-opac&idx=1&isbn=9780007264551&mediatype=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Sep 2015 14:41:02 GMT
+      Server:
+      - Apache
+      Etag:
+      - '"6d8b9fb05e8e3326ec58042e6b4da79a"'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      X-Runtime:
+      - '0.023824'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Status:
+      - '200'
+      Content-Type:
+      - application/xml; charset=utf-8
+      Set-Cookie:
+      - _front_session_id=15de94ec0513f4dd3ad244bdfe6ae042; domain=.iss.ndl.go.jp;
+        path=/; expires=Mon, 28-Sep-2015 15:41:02 GMT; HttpOnly
+      - serverid=1101; path=/
+      Vary:
+      - Accept-Encoding,User-Agent
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Length:
+      - '512'
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJzcyB4
+        bWxuczpkY3Rlcm1zPSJodHRwOi8vcHVybC5vcmcvZGMvdGVybXMvIiB4bWxu
+        czpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRh
+        eC1ucyMiIHhtbG5zOmRjbmRsPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rl
+        cm1zLyIgdmVyc2lvbj0iMi4wIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3Jn
+        L2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOm9wZW5TZWFyY2g9Imh0dHA6Ly9h
+        OS5jb20vLS9zcGVjL29wZW5zZWFyY2hyc3MvMS4wLyIgeG1sbnM6eHNpPSJo
+        dHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeG1s
+        bnM6cmRmcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wMS9yZGYtc2NoZW1h
+        IyIgeG1sbnM6ZGNtaXR5cGU9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlw
+        ZS8iPgogIDxjaGFubmVsPgogICAgPHRpdGxlPjEgOTc4MDAwNzI2NDU1MSBp
+        c3MtbmRsLW9wYWMgLSDlm73nq4vlm73kvJrlm7Pmm7jppKjjgrXjg7zjg4Eg
+        T3BlblNlYXJjaDwvdGl0bGU+CiAgICA8bGluaz5odHRwOi8vaXNzLm5kbC5n
+        by5qcC9hcGkvb3BlbnNlYXJjaD9kcGlkPWlzcy1uZGwtb3BhYyZhbXA7Y250
+        PTEwJmFtcDtpc2JuPTk3ODAwMDcyNjQ1NTEmYW1wO2lkeD0xJmFtcDttZWRp
+        YXR5cGU9MTwvbGluaz4KICAgIDxkZXNjcmlwdGlvbj5TZWFyY2ggcmVzdWx0
+        cyBmb3IgaXNibj05NzgwMDA3MjY0NTUxIG1lZGlhdHlwZT0xIGNudD0xMCBk
+        cGlkPWlzcy1uZGwtb3BhYyA8L2Rlc2NyaXB0aW9uPgogICAgPGxhbmd1YWdl
+        PmphPC9sYW5ndWFnZT4KICAgIDxvcGVuU2VhcmNoOnRvdGFsUmVzdWx0cz4w
+        PC9vcGVuU2VhcmNoOnRvdGFsUmVzdWx0cz4KICAgIDxvcGVuU2VhcmNoOnN0
+        YXJ0SW5kZXg+MTwvb3BlblNlYXJjaDpzdGFydEluZGV4PgogICAgPG9wZW5T
+        ZWFyY2g6aXRlbXNQZXJQYWdlPjEwPC9vcGVuU2VhcmNoOml0ZW1zUGVyUGFn
+        ZT4KICA8L2NoYW5uZWw+CjwvcnNzPgo=
+    http_version: 
+  recorded_at: Mon, 28 Sep 2015 05:58:13 GMT
+- request:
+    method: get
+    uri: http://iss.ndl.go.jp/api/opensearch?cnt=10&dpid=iss-ndl-opac&idx=1&isbn=0007264550&mediatype=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Sep 2015 14:41:12 GMT
+      Server:
+      - Apache
+      Etag:
+      - '"a7f7f17b9ec21ae047b47de09e967682"'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      X-Runtime:
+      - '0.023121'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Status:
+      - '200'
+      Content-Type:
+      - application/xml; charset=utf-8
+      Set-Cookie:
+      - _front_session_id=11f029fc0a16dbd8ee7e507cea72c62e; domain=.iss.ndl.go.jp;
+        path=/; expires=Mon, 28-Sep-2015 15:41:12 GMT; HttpOnly
+      - serverid=1102; path=/
+      Vary:
+      - Accept-Encoding,User-Agent
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Length:
+      - '508'
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJzcyB4
+        bWxuczpkY3Rlcm1zPSJodHRwOi8vcHVybC5vcmcvZGMvdGVybXMvIiB4bWxu
+        czpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRh
+        eC1ucyMiIHhtbG5zOmRjbmRsPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rl
+        cm1zLyIgdmVyc2lvbj0iMi4wIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3Jn
+        L2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOm9wZW5TZWFyY2g9Imh0dHA6Ly9h
+        OS5jb20vLS9zcGVjL29wZW5zZWFyY2hyc3MvMS4wLyIgeG1sbnM6eHNpPSJo
+        dHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeG1s
+        bnM6cmRmcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wMS9yZGYtc2NoZW1h
+        IyIgeG1sbnM6ZGNtaXR5cGU9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlw
+        ZS8iPgogIDxjaGFubmVsPgogICAgPHRpdGxlPjAwMDcyNjQ1NTAgMSBpc3Mt
+        bmRsLW9wYWMgLSDlm73nq4vlm73kvJrlm7Pmm7jppKjjgrXjg7zjg4EgT3Bl
+        blNlYXJjaDwvdGl0bGU+CiAgICA8bGluaz5odHRwOi8vaXNzLm5kbC5nby5q
+        cC9hcGkvb3BlbnNlYXJjaD9tZWRpYXR5cGU9MSZhbXA7ZHBpZD1pc3MtbmRs
+        LW9wYWMmYW1wO2lkeD0xJmFtcDtjbnQ9MTAmYW1wO2lzYm49MDAwNzI2NDU1
+        MDwvbGluaz4KICAgIDxkZXNjcmlwdGlvbj5TZWFyY2ggcmVzdWx0cyBmb3Ig
+        aXNibj0wMDA3MjY0NTUwIG1lZGlhdHlwZT0xIGNudD0xMCBkcGlkPWlzcy1u
+        ZGwtb3BhYyA8L2Rlc2NyaXB0aW9uPgogICAgPGxhbmd1YWdlPmphPC9sYW5n
+        dWFnZT4KICAgIDxvcGVuU2VhcmNoOnRvdGFsUmVzdWx0cz4wPC9vcGVuU2Vh
+        cmNoOnRvdGFsUmVzdWx0cz4KICAgIDxvcGVuU2VhcmNoOnN0YXJ0SW5kZXg+
+        MTwvb3BlblNlYXJjaDpzdGFydEluZGV4PgogICAgPG9wZW5TZWFyY2g6aXRl
+        bXNQZXJQYWdlPjEwPC9vcGVuU2VhcmNoOml0ZW1zUGVyUGFnZT4KICA8L2No
+        YW5uZWw+CjwvcnNzPgo=
+    http_version: 
+  recorded_at: Mon, 28 Sep 2015 05:58:13 GMT
+recorded_with: VCR 2.9.3