enju_ndl 0.1.0.pre26 → 0.1.0.pre27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1c48789c634e863b03e8e22228eb35ebfef5d5
-  data.tar.gz: a29e1bac9d9f11dbb171c44c4b870e9d547aacf2
+  metadata.gz: 642a6b6fc3846571a344ef0b97c270897bdd6dbb
+  data.tar.gz: 71ff1acdc57df33ee51e753e3e1f1a5b64930ed4
 SHA512:
-  metadata.gz: a19dcc7d9ba551144e50181df1be9fee83882257f92dde5bf93f0235e35468b9e732764154139809343568fb7f9b781474e4519b0b74e9bbf5f21dbcf5c08161
-  data.tar.gz: db3ad54d5539bd43fb631fe66c1718850951ccc86ac8c55f74c86891619b3f68a2fc4dc2ecf96d47a5d192993ac1c0cc765da7ce723d5006a8e94b4f60a8a92c
+  metadata.gz: a926ae573d2fc136dba65e0f6762b9ae066f0ba2300f94b34612b2ea0493c67aa7436678dbb92009e76e7f562119eada39c57e92739021a0eddf32d781e295ba
+  data.tar.gz: 5d9dcbaeb9b58d979129d23460657e43721c1fa9d14e3fd394055364cf6ee344a984279fe383f301ed58b67cae0c11c20c3b5c7ff07c089817eee04ac8cd17ce

data/app/controllers/ndl_books_controller.rb

@@ -22,7 +22,7 @@ class NdlBooksController < ApplicationController
   def create
     if params[:book]
       begin
-        @manifestation = NdlBook.import_from_sru_response(params[:book][:jpno])
+        @manifestation = NdlBook.import_from_sru_response(params[:book][:iss_itemno])
       rescue EnjuNdl::RecordNotFound
       end
       respond_to do |format|

data/app/helpers/ndl_books_helper.rb

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
 module NdlBooksHelper
-  def link_to_import_from_ndl(jpno)
-    if jpno.blank?
+  def link_to_import_from_ndl(iss_itemno)
+    if iss_itemno.blank?
       t('enju_ndl.not_available')
     else
-      identifier_type = IdentifierType.where(:name => 'jpno').first
+      identifier_type = IdentifierType.where(:name => 'iss_itemno').first
       if identifier_type
-        manifestation = Identifier.where(:body => jpno, :identifier_type_id => identifier_type.id).first.try(:manifestation)
+        manifestation = Identifier.where(:body => iss_itemno, :identifier_type_id => identifier_type.id).first.try(:manifestation)
       end
       unless manifestation
-        link_to t('enju_ndl.add'), ndl_books_path(:book => {:jpno => jpno}), :method => :post
+        link_to t('enju_ndl.add'), ndl_books_path(:book => {:iss_itemno => iss_itemno}), :method => :post
       else
         link_to t('enju_ndl.already_exists'), manifestation
       end

data/app/models/ndl_book.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 class NdlBook
-  attr_reader :jpno, :permalink, :title, :creator, :publisher, :issued, :isbn
+  attr_reader :jpno, :permalink, :title, :creator, :publisher, :issued, :isbn,
+    :itemno
 
   def initialize(node)
     @node = node
@@ -14,6 +15,10 @@ class NdlBook
     @node.at('./link').try(:content).to_s
   end
 
+  def itemno
+    URI.parse(permalink).path.split('/').last
+  end
+
   def title
     @node.at('./title').try(:content).to_s
   end
@@ -61,15 +66,14 @@ class NdlBook
     end
   end
 
-  def self.import_from_sru_response(jpno)
-    identifier = Identifier.where(:body => jpno, :identifier_type_id => IdentifierType.where(:name => 'jpno').first_or_create.id).first
+  def self.import_from_sru_response(itemno)
+    identifier = Identifier.where(:body => itemno, :identifier_type_id => IdentifierType.where(:name => 'iss_itemno').first_or_create.id).first
     return if identifier
-    url = "http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&&maximumRecords=1&&query=%28jpno=#{jpno}%29&onlyBib=true"
+    url = "http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&maximumRecords=1&query=%28itemno=#{itemno}%29&onlyBib=true"
     xml = open(url).read
     response = Nokogiri::XML(xml).at('//xmlns:recordData')
     return unless response.try(:content)
-    doc = Nokogiri::XML(response.content)
-    Manifestation.import_record(doc)
+    Manifestation.import_record(Nokogiri::XML(response.content))
   end
 
   attr_accessor :url

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

@@ -22,7 +22,7 @@
   <% @books.each do |book| %>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= link_to_import_from_ndl(book.jpno) %>
+        <%= link_to_import_from_ndl(book.itemno) %>
       </td>
       <td>
         <strong><%= link_to "#{book.title} #{book.volume}".strip , book.permalink %></strong>

data/lib/enju_ndl/ndl_search.rb

@@ -27,10 +27,12 @@ module EnjuNdl
       end
 
       def import_record(doc)
-        jpno = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
-        identifier = Identifier.where(:body => jpno, :identifier_type_id => IdentifierType.where(:name => 'jpno').first_or_create.id).first
+        iss_itemno = URI.parse(doc.at('//dcndl:BibAdminResource[@rdf:about]').values.first).path.split('/').last
+        identifier = Identifier.where(:body => iss_itemno, :identifier_type_id => IdentifierType.where(:name => 'iss_itemno').first_or_create.id).first
         return identifier.manifestation if identifier
 
+        jpno = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
+
         publishers = get_publishers(doc)
 
         # title
@@ -111,6 +113,10 @@ module EnjuNdl
             identifier[:isbn] = Identifier.new(:body => isbn)
             identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
           end
+          if iss_itemno
+            identifier[:iss_itemno] = Identifier.new(:body => iss_itemno)
+            identifier[:iss_itemno].identifier_type = IdentifierType.where(:name => 'iss_itemno').first_or_create
+          end
           if jpno
             identifier[:jpno] = Identifier.new(:body => jpno)
             identifier[:jpno].identifier_type = IdentifierType.where(:name => 'jpno').first_or_create

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre26"
+  VERSION = "0.1.0.pre27"
 end