enju_biblio 0.1.0.pre5 → 0.1.0.pre6

data/app/models/carrier_type.rb

@@ -1,5 +1,5 @@
 class CarrierType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
+  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope :order => "carrier_types.position"
   has_many :manifestations

data/app/models/manifestation.rb

@@ -527,7 +527,10 @@ class Manifestation < ActiveRecord::Base
   def set_patron_role_type(patron_lists, options = {:scope => :creator})
     patron_lists.each do |patron_list|
       name_and_role = patron_list[:full_name].split('||')
-      patron = Patron.where(:full_name => name_and_role[0]).first
+      if patron_list[:patron_identifier].present?
+        patron = Patron.where(:patron_identifier => patron_list[:patron_identifier]).first
+      end
+      patron = Patron.where(:full_name => name_and_role[0]).first unless patron
       next unless patron
       type = name_and_role[1].to_s.strip
 

data/app/models/patron.rb

@@ -228,7 +228,11 @@ class Patron < ActiveRecord::Base
     patrons = []
     patron_lists.each do |patron_list|
       name_and_role = patron_list[:full_name].split('||')
-      patron = Patron.where(:full_name => name_and_role[0]).first
+      if patron_list[:patron_identifier].present?
+        patron = Patron.where(:patron_identifier => patron_list[:patron_identifier]).first
+      else
+        patron = Patron.where(:full_name => name_and_role[0]).first
+      end
       role_type = name_and_role[1].to_s.strip
       unless patron
         patron = Patron.new(

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

@@ -0,0 +1,47 @@
+<div class="span9">
+<h1 class="title">NDLサーチ検索によるインポート</h1>
+  <p id="notice"><%= notice %></p>
+
+<%= form_for :books, :url => ndl_books_path, :html => {:method => 'get'} do -%>
+  <p>
+    <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form'} -%>
+    <%= submit_tag '検索' -%>
+  </p>
+<%- end -%>
+
+<% if @query.present? %>
+<p><%= @books.total_count %> 件が見つかりました。</p>
+
+<table class="table table-striped index">
+  <tr>
+    <th></th>
+    <th>書名</th>
+  </tr>
+  <% @books.each do |book| %>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= link_to_import(book.at('./dc:identifier[@xsi:type="dcndl:JPNO"]').try(:content).to_s) %>
+      </td>
+      <td>
+        <%= link_to book.at('./title').content, book.at('./link').content %>
+        <br />
+        <%= book.xpath('./dc:creator').collect(&:content).join(' ') %>
+      	<%= book.xpath('./dc:publisher').collect(&:content).join(' ') %>
+        (<%= book.at('./dcterms:issued[@xsi:type="dcterms:W3CDTF"]').try(:content) %>,
+        ISBN: <%= book.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content).to_s %>)
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<br />
+
+<%= paginate(@books) %>
+<% else %>
+  <%= javascript_tag("$('#search_form_top').focus()") -%>
+<% end %>
+
+</div>
+
+<div class="span3">
+</div>

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

@@ -25,7 +25,7 @@
 <% @series_statements.each do |series_statement| %>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, series_statement -%>
+      <%- if @query.present? and can? :update, series_statement -%>
         <%= move_position(series_statement) -%>
       <%- end -%>
     </td>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end