enju_ndl 0.0.12 → 0.0.13

data/app/controllers/ndl_books_controller.rb

@@ -18,12 +18,12 @@ class NdlBooksController < ApplicationController
   def create
     if params[:book]
       @manifestation = NdlBook.import_from_sru_response(params[:book][:nbn])
-      if @manifestation.save
+      if @manifestation.try(:save)
         flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation'))
         flash[:porta_import] == true
         redirect_to manifestation_items_url(@manifestation)
       else
-        flash[:notice] = t('page.record_not_found')
+        flash[:notice] = t('enju_ndl.record_not_found')
         redirect_to ndl_books_url
       end
     end

data/app/helpers/ndl_books_helper.rb

@@ -1,11 +1,15 @@
 # -*- encoding: utf-8 -*-
 module NdlBooksHelper
   def link_to_import(nbn)
-    manifestation = Manifestation.where(:nbn => nbn).first
-    unless manifestation
-      link_to '追加', ndl_books_path(:book => {:nbn => nbn}), :method => :post
+    if nbn.blank?
+      t('enju_ndl.not_available')
     else
-      '登録済み'
+      manifestation = Manifestation.where(:nbn => nbn).first
+      unless manifestation
+        link_to '追加', ndl_books_path(:book => {:nbn => nbn}), :method => :post
+      else
+        '登録済み'
+      end
     end
   end
 end

data/app/models/ndl_book.rb

@@ -20,19 +20,6 @@ class NdlBook
     10
   end
 
-  def self.find_by_isbn(isbn)
-    url = "http://iss.ndl.go.jp/api/opensearch?dpid=iss-ndl-opac&isbn=#{isbn}&cnt=1&idx=1"
-    Rails.logger.debug url
-    xml = open(url).read
-    doc = Nokogiri::XML(xml).at('//channel/item')
-    {
-      :title => doc.at('./title').content,
-      :publisher => doc.xpath('./dc:publisher').collect(&:content).join(' '),
-      :creator => doc.xpath('./dc:creator[@xsi:type="dcndl:NDLNH"]').collect(&:content).join(' '),
-      :isbn => doc.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content).to_s
-    }
-  end
-
   def self.import_from_sru_response(jpno)
     manifestation = Manifestation.where(:nbn => jpno).first
     return if manifestation

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

@@ -5,7 +5,7 @@
 
 <%= form_for :books, :url => ndl_books_path, :html => {:method => 'get'} do -%>
   <p>
-    <%= text_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form'} -%>
+    <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form'} -%>
     <%= submit_tag '検索' -%>
   </p>
 <%- end -%>

data/config/locales/en.yml

@@ -1,3 +1,6 @@
 en:
   enju_ndl:
     import_from_ndl_search: Import from NDL Search
+    record_not_found: Record not found.
+    not_available: Not available
+

data/config/locales/ja.yml

@@ -1,3 +1,5 @@
 ja:
   enju_ndl:
     import_from_ndl_search: NDLサーチ検索によるインポート
+    record_not_found: 資料が見つかりません。
+    not_available: 利用不可

data/lib/enju_ndl/engine.rb

@@ -2,6 +2,9 @@ require 'devise'
 require 'nokogiri'
 require 'rss'
 require 'isbn/tools'
+require 'acts_as_list'
+require 'attribute_normalizer'
+require 'library_stdnums'
 
 module EnjuNdl
   class Engine < Rails::Engine

data/lib/enju_ndl/ndl_search.rb

@@ -20,8 +20,6 @@ module EnjuNdl
       end
 
       def import_record(doc)
-        pub_date, langugage, nbn, ndc, isbn = nil, nil, nil, nil, nil
-
         nbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
         manifestation = Manifestation.where(:nbn => nbn).first if nbn
         return manifestation if manifestation
@@ -32,7 +30,7 @@ module EnjuNdl
         title = get_title(doc)
 
         # date of publication
-        pub_date = doc.at('//dcterms:date').content.to_s.gsub(/\./, '-')
+        pub_date = doc.at('//dcterms:date').try(:content).to_s.gsub(/\./, '-')
         unless pub_date =~  /^\d+(-\d{0,2}){0,2}$/
           pub_date = nil
         end
@@ -44,18 +42,34 @@ module EnjuNdl
           language_id = 1
         end
 
-        isbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content).to_s
+        isbn = ISBN_Tools.cleanup(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content))
+        issn_l = ISBN_Tools.cleanup(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSNL"]').try(:content))
         classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
         if classification_urls
-          ndc9_url = classification_urls.map{|url| URI.parse(url)}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
+          ndc9_url = classification_urls.map{|url| URI.parse(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
           if ndc9_url
             ndc = ndc9_url.path.split('/').last
           end
         end
+
+        carrier_type = content_type = nil
+        doc.xpath('//dcndl:materialType[@rdf:resource]').each do |d|
+          case d.attributes['resource'].try(:content)
+          when 'http://ndl.go.jp/ndltype/Book'
+            carrier_type = CarrierType.where(:name => 'print').first
+            content_type = ContentType.where(:name => 'text').first
+          when 'http://purl.org/dc/dcmitype/Sound'
+            content_type = ContentType.where(:name => 'audio').first
+          when 'http://purl.org/dc/dcmitype/MovingImage'
+            content_type = ContentType.where(:name => 'video').first
+          when 'http://ndl.go.jp/ndltype/ElectronicResource'
+            carrier_type = CarrierType.where(:name => 'file').first
+          end
+        end
+
         description = doc.at('//dcterms:abstract').try(:content)
         price = doc.at('//dcndl:price').try(:content)
         volume_number_string = doc.at('//dcndl:volume/rdf:Description/rdf:value').try(:content)
-
         manifestation = nil
         Patron.transaction do
           publisher_patrons = Patron.import_patrons(publishers)
@@ -76,10 +90,14 @@ module EnjuNdl
             :nbn => nbn,
             :ndc => ndc
           )
+          manifestation.carrier_type = carrier_type if carrier_type
+          manifestation.content_type = content_type if content_type
           manifestation.publishers << publisher_patrons
           create_frbr_instance(doc, manifestation)
         end
 
+        create_series_statement(doc, manifestation)
+
         #manifestation.send_later(:create_frbr_instance, doc.to_s)
         return manifestation
       end
@@ -178,7 +196,7 @@ module EnjuNdl
 
       def get_language(doc)
         # TODO: 言語が複数ある場合
-        language = doc.at('//dcterms:language[@rdf:datatype="http://purl.org/dc/terms/ISO639-2"]').content
+        language = doc.at('//dcterms:language[@rdf:datatype="http://purl.org/dc/terms/ISO639-2"]').try(:content)
         if language
           language.downcase
         end
@@ -191,6 +209,46 @@ module EnjuNdl
         end
         return publishers
       end
+
+      def create_series_statement(doc, manifestation)
+        series = series_title = {}
+        series[:title] = doc.at('//dcndl:seriesTitle/rdf:Description/rdf:value').try(:content)
+        series[:title_transcription] = doc.at('//dcndl:seriesTitle/rdf:Description/dcndl:seriesTitleTranscription').try(:content)
+        if series[:title]
+          series_title[:title] = series[:title].split(';')[0].strip
+          series_title[:title_transcription] = series[:title_transcription]
+        end
+
+        publication_periodicity = doc.at('//dcndl:publicationPeriodicity').try(:content)
+
+        if series_title[:title]
+          series_statement = SeriesStatement.where(:original_title => series_title[:title]).first
+          unless series_statement
+            series_statement = SeriesStatement.new(
+              :original_title => series_title[:title],
+              :title_transcription => series_title[:title_transcription],
+              :periodical => false
+            )
+          end
+        elsif publication_periodicity
+          issn = ISBN_Tools.cleanup(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSN"]').try(:content))
+          series_statement = SeriesStatement.where(:issn => issn).first
+          unless series_statement
+            series_statement = SeriesStatement.new(
+              :original_title => manifestation.original_title,
+              :title_transcription => manifestation.title_transcription,
+              :issn => issn,
+              :periodical => true
+            )
+          end
+        end
+
+        if series_statement
+          manifestation.series_statement = series_statement
+          manifestation.save
+        end
+        manifestation
+      end
     end
 
     class AlreadyImported < StandardError

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70242626790440 !ruby/object:Gem::Requirement
+  requirement: &70163314227080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70242626790440
+  version_requirements: *70163314227080
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70242626790020 !ruby/object:Gem::Requirement
+  requirement: &70163314226520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242626790020
+  version_requirements: *70163314226520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70242626789560 !ruby/object:Gem::Requirement
+  requirement: &70163314225900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242626789560
+  version_requirements: *70163314225900
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70242626805440 !ruby/object:Gem::Requirement
+  requirement: &70163314225200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,43 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242626805440
+  version_requirements: *70163314225200
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: &70163314224780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70163314224780
+- !ruby/object:Gem::Dependency
+  name: attribute_normalizer
+  requirement: &70163314224200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70163314224200
+- !ruby/object:Gem::Dependency
+  name: library_stdnums
+  requirement: &70163314223780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70163314223780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70242626805020 !ruby/object:Gem::Requirement
+  requirement: &70163314223360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242626805020
+  version_requirements: *70163314223360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70242626804560 !ruby/object:Gem::Requirement
+  requirement: &70163314222940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242626804560
+  version_requirements: *70163314222940
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -130,3 +163,4 @@ summary: enju_ndl plugin
 test_files:
 - test/enju_ndl_test.rb
 - test/test_helper.rb
+has_rdoc: