RubyGems - enju_ndl - Versions diffs - 0.0.3 → 0.0.4 - Mend

enju_ndl 0.0.3 → 0.0.4

Files changed (11) hide show

data/app/models/ndl_book.rb +3 -4
data/app/views/layouts/ndl_books.html.erb +1 -1
data/app/views/ndl_books/index.html.erb +4 -3
data/config/locales/en.yml +1 -1
data/config/locales/ja.yml +1 -1
data/lib/enju_ndl.rb +0 -5
data/lib/enju_ndl/engine.rb +5 -0
data/lib/enju_ndl/ndl_search.rb +152 -33
data/lib/enju_ndl/version.rb +1 -1
metadata +42 -11
data/lib/enju_ndl/porta.rb +0 -165

data/app/models/ndl_book.rb CHANGED Viewed

@@ -5,12 +5,11 @@ class NdlBook
       cnt = self.per_page
       page = 1 if page.to_i < 1
       idx = (page.to_i - 1) * cnt + 1
-      url = "http://api.porta.ndl.go.jp/servicedp/opensearch?dpid=zomoku&any=#{URI.encode(query.strip)}&cnt=#{cnt}&idx=#{idx}"
-      Rails.logger.debug url
-      xml = open(url).read
-      doc = Nokogiri::XML(xml)
+      doc = Nokogiri::XML(Manifestation.search_ndl(query, {:cnt => cnt, :page => page, :idx => idx, :raw => true}).to_s)
+#      raise doc.to_s
       items = doc.xpath('//channel/item')
       total_entries = doc.at('//channel/openSearch:totalResults').content.to_i
       {:items => items, :total_entries => total_entries}
     else
       {:items => [], :total_entries => 0}

data/app/views/layouts/ndl_books.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
   <meta charset="UTF-8" />
   <%= render 'page/include' %>
   <%= render 'page/portlets' %>
-  <title><%= t('enju_ndl.import_from_porta') %></title>
+  <title><%= t('enju_ndl.import_from_ndl_search') %></title>
 </head>
 <body itemscope itemtype="http://schema.org/WebPage">

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title">PORTA検索によるインポート</h1>
+<h1 class="title">NDLサーチ検索によるインポート</h1>
 <div id="content_list">
   <p id="notice"><%= notice %></p>
@@ -26,9 +26,10 @@
       <td>
         <%= link_to book.at('./title').content, book.at('./link').content %>
         <br />
-        <%= book.xpath('./dc:creator[@xsi:type="dcndl:NDLNH"]').collect(&:content).join(' ') %>
+        <%= book.xpath('./dc:creator').collect(&:content).join(' ') %>
       	<%= book.xpath('./dc:publisher').collect(&:content).join(' ') %>
-        ISBN: <%= book.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content).to_s %>
+        (<%= Time.zone.parse(book.at('./pubDate').content).year %>,
+        ISBN: <%= book.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content).to_s %>)
       </td>
     </tr>
   <% end %>

data/config/locales/en.yml CHANGED Viewed

@@ -1,3 +1,3 @@
 en:
   enju_ndl:
-    import_from_porta: Import from PORTA
+    import_from_ndl_search: Import from NDL Search

data/config/locales/ja.yml CHANGED Viewed

@@ -1,3 +1,3 @@
 ja:
   enju_ndl:
-    import_from_porta: PORTA検索によるインポート
+    import_from_ndl_search: NDLサーチ検索によるインポート

data/lib/enju_ndl.rb CHANGED Viewed

@@ -3,7 +3,6 @@ require "enju_ndl/engine"
 require 'open-uri'
 require 'enju_ndl/ndl_search'
 require 'enju_ndl/crd'
-require 'enju_ndl/porta'
 module EnjuNdl
   module ActsAsMethods
@@ -19,10 +18,6 @@ module EnjuNdl
       def enju_ndl_crd
         include EnjuNdl::Crd
       end
-      def enju_ndl_porta
-        include EnjuNdl::Porta
-      end
     end
   end

data/lib/enju_ndl/engine.rb CHANGED Viewed

@@ -1,3 +1,8 @@
+require 'devise'
+require 'nokogiri'
+require 'rss'
+require 'isbn/tools'
 module EnjuNdl
   class Engine < Rails::Engine
   end

data/lib/enju_ndl/ndl_search.rb CHANGED Viewed

@@ -6,43 +6,162 @@ module EnjuNdl
     end
     module ClassMethods
-      def rss_import(url)
-        doc = Nokogiri::XML(open(url))
-        ns = {"dc" => "http://purl.org/dc/elements/1.1/", "xsi" => "http://www.w3.org/2001/XMLSchema-instance", "dcndl" => "http://ndl.go.jp/dcndl/terms/"}
-        doc.xpath('//item', ns).each do |item|
-          isbn = item.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content)
-          ndl_bib_id = item.at('./dc:identifier[@xsi:type="dcndl:NDLBibID"]').try(:content)
-          manifestation = Manifestation.where(:ndl_bib_id => ndl_bib_id).first
-          manifestation = Manifestation.find_by_isbn(isbn) unless manifestation
-          # FIXME: 日本語決めうち？
-          language_id = Language.where(:iso_639_2 => 'jpn').first.id rescue 1
-          unless manifestation
-            manifestation = self.new(
-              :original_title => item.at('./dc:title').content,
-              :title_transcription => item.at('./dcndl:titleTranscription').try(:content),
-              :isbn => isbn,
-              :ndl_bib_id => ndl_bib_id,
-              :description => item.at('./dc:description').try(:content),
-              :pub_date => item.at('./dc:date').try(:content).try(:gsub, '.', '-'),
-              :language_id => language_id
-            )
-            if manifestation.valid?
-              item.xpath('./dc:creator').each_with_index do |creator, i|
-                next if i == 0
-                patron = Patron.where(:full_name => creator.try(:content)).first
-                patron =  Patron.new(:full_name => creator.try(:content)) unless patron
-                manifestation.creators << patron if patron.valid?
-              end
-              item.xpath('./dc:publisher').each_with_index do |publisher, i|
-                patron = Patron.where(:full_name => publisher.try(:content)).first
-                patron =  Patron.new(:full_name => publisher.try(:content)) unless patron
-                manifestation.publishers << patron if patron.valid?
-              end
+      def import_isbn(isbn)
+        isbn = ISBN_Tools.cleanup(isbn)
+        raise EnjuNdl::InvalidIsbn unless ISBN_Tools.is_valid?(isbn)
+        manifestation = Manifestation.find_by_isbn(isbn)
+        return manifestation if manifestation
+        doc = return_xml(isbn)
+        #raise EnjuNdl::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
+        raise EnjuNdl::RecordNotFound unless doc
+        pub_date, language, nbn = nil, nil, nil
+        publishers = get_publishers(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
+        # title
+        title = get_title(doc)
+        # date of publication
+        pub_date = doc.at('//dcterms:date').content.to_s.gsub(/\./, '-')
+        unless pub_date =~  /^\d+(-\d{0,2}){0,2}$/
+          pub_date = nil
+        end
+        language = get_language(doc)
+        nbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').content
+        classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
+        ndc = classification_urls.map{|url| URI.parse(url)}.select{|url| url.path.split('/').reverse[1] == 'ndc9'}.first.path.split('/').last
+        Patron.transaction do
+          publisher_patrons = Patron.import_patrons(publishers)
+          language_id = Language.where(:iso_639_2 => language).first.id rescue 1
+          manifestation = Manifestation.new(
+            :original_title => title[:manifestation],
+            :title_transcription => title[:transcription],
+            # TODO: NDLサーチに入っている図書以外の資料を調べる
+            #:carrier_type_id => CarrierType.where(:name => 'print').first.id,
+            :language_id => language_id,
+            :isbn => isbn,
+            :pub_date => pub_date,
+            :nbn => nbn,
+            :ndc => ndc
+          )
+          manifestation.ndc = ndc
+          manifestation.publishers << publisher_patrons
+        end
+        #manifestation.send_later(:create_frbr_instance, doc.to_s)
+        create_frbr_instance(doc, manifestation)
+        return manifestation
+      end
+      def import_isbn!(isbn)
+        manifestation = import_isbn(isbn)
+        manifestation.save!
+        manifestation
+      end
+      def create_frbr_instance(doc, manifestation)
+        title = get_title(doc)
+        creators = get_creators(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
+        language = get_language(doc)
+        subjects = get_subjects(doc)
+        Patron.transaction do
+          creator_patrons = Patron.import_patrons(creators)
+          language_id = Language.where(:iso_639_2 => language).first.id rescue 1
+          content_type_id = ContentType.where(:name => 'text').first.id rescue 1
+          manifestation.creators << creator_patrons
+          if defined?(Subject)
+            subjects.each do |term|
+              subject = Subject.where(:term => term).first
+              manifestation.subjects << subject if subject
             end
           end
         end
-        Sunspot.commit
       end
+      def search_ndl(query, options = {})
+        options = {:dpid => 'iss-ndl-opac', :item => 'any', :startrecord => 1, :per_page => 10, :raw => false}.merge(options)
+        doc = nil
+        results = {}
+        startrecord = options[:startrecord].to_i
+        if startrecord == 0
+          startrecord = 1
+        end
+        url = "http://iss.ndl.go.jp/api/opensearch?dpid=#{options[:dpid]}&#{options[:item]}=#{URI.escape(query)}&cnt=#{options[:per_page]}&idx=#{startrecord}"
+        if options[:raw] == true
+          open(url).read
+        else
+          RSS::Rss::Channel.install_text_element("openSearch:totalResults", "http://a9.com/-/spec/opensearchrss/1.0/", "?", "totalResults", :text, "openSearch:totalResults")
+          RSS::BaseListener.install_get_text_element "http://a9.com/-/spec/opensearchrss/1.0/", "totalResults", "totalResults="
+          feed = RSS::Parser.parse(url, false)
+        end
+      end
+      def normalize_isbn(isbn)
+        if isbn.length == 10
+          ISBN_Tools.isbn10_to_isbn13(isbn)
+        else
+          ISBN_Tools.isbn13_to_isbn10(isbn)
+        end
+      end
+      def return_xml(isbn)
+        rss = self.search_ndl(isbn, {:dpid => 'iss-ndl-opac', :item => 'isbn'})
+        if rss.channel.totalResults.to_i == 0
+          isbn = normalize_isbn(isbn)
+          rss = self.search_ndl(isbn, {:dpid => 'iss-ndl-opac', :item => 'isbn'})
+        end
+        if rss.items.first
+          doc = Nokogiri::XML(open("#{rss.items.first.link}.rdf").read)
+        end
+      end
+      private
+      def get_title(doc)
+        title = {
+          :manifestation => doc.xpath('//dc:title/rdf:Description/rdf:value').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
+          :transcription => doc.xpath('//dc:title/dcndl:transcription').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
+          :original => doc.xpath('//dcterms:alternative/rdf:Rescription/rdf:value').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' ')
+        }
+      end
+      def get_creators(doc)
+        creators = []
+        doc.xpath('//dcterms:creator/foaf:Agent/foaf:name').each do |creator|
+          creators << creator.content.gsub('‖', '').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ')
+        end
+        creators
+      end
+      def get_subjects(doc)
+        subjects = []
+        doc.xpath('//dcterms:subject/rdf:Description/rdf:value').each do |subject|
+          subjects << subject.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
+        end
+        return subjects
+      end
+      def get_language(doc)
+        # TODO: 言語が複数ある場合
+        language = doc.xpath('//dcterms:language').first.content.downcase
+      end
+      def get_publishers(doc)
+        publishers = []
+        doc.xpath('//dcterms:publisher/foaf:Agent/foaf:name').each do |publisher|
+          publishers << publisher.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
+        end
+        return publishers
+      end
+    end
+    class AlreadyImported < StandardError
     end
   end
 end

data/lib/enju_ndl/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease:
 platform: ruby
 authors:
@@ -9,22 +9,55 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70201338394300 !ruby/object:Gem::Requirement
+  requirement: &70123411904400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70201338394300
+  version_requirements: *70123411904400
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &70123411918620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70123411918620
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70123411945180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70123411945180
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: &70123411964080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70123411964080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70201338393660 !ruby/object:Gem::Requirement
+  requirement: &70123412083020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201338393660
+  version_requirements: *70123412083020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70201338392740 !ruby/object:Gem::Requirement
+  requirement: &70123412079920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201338392740
+  version_requirements: *70123412079920
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -62,7 +95,6 @@ files:
 - lib/enju_ndl/crd.rb
 - lib/enju_ndl/engine.rb
 - lib/enju_ndl/ndl_search.rb
-- lib/enju_ndl/porta.rb
 - lib/enju_ndl/version.rb
 - lib/enju_ndl.rb
 - lib/tasks/enju_ndl_tasks.rake
@@ -98,4 +130,3 @@ summary: enju_ndl plugin
 test_files:
 - test/enju_ndl_test.rb
 - test/test_helper.rb
-has_rdoc:

data/lib/enju_ndl/porta.rb DELETED Viewed

@@ -1,165 +0,0 @@
-# -*- encoding: utf-8 -*-
-module EnjuNdl
-  module Porta
-    def self.included(base)
-      base.extend ClassMethods
-    end
-    module ClassMethods
-      def import_isbn(isbn)
-        isbn = ISBN_Tools.cleanup(isbn)
-        raise EnjuNdl::InvalidIsbn unless ISBN_Tools.is_valid?(isbn)
-        manifestation = Manifestation.find_by_isbn(isbn)
-        return manifestation if manifestation
-        doc = return_xml(isbn)
-        raise EnjuNdl::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
-        pub_date, language, nbn = nil, nil, nil
-        publishers = get_publishers(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
-        # title
-        title = get_title(doc)
-        # date of publication
-        pub_date = doc.at('//dcterms:issued').content.try(:tr, '０-９．', '0-9-').to_s.gsub(/（.*）/, '')
-        unless pub_date =~  /^\d+(-\d{0,2}){0,2}$/
-          pub_date = nil
-        end
-        language = get_language(doc)
-        nbn = doc.at('//dc:identifier[@xsi:type="dcndl:JPNO"]').content
-        ndc = doc.at('//dc:subject[@xsi:type="dcndl:NDC"]').try(:content)
-        Patron.transaction do
-          publisher_patrons = Patron.import_patrons(publishers)
-          language_id = Language.where(:iso_639_2 => language).first.id rescue 1
-          manifestation = Manifestation.new(
-            :original_title => title[:manifestation],
-            :title_transcription => title[:transcription],
-            # TODO: PORTAに入っている図書以外の資料を調べる
-            #:carrier_type_id => CarrierType.where(:name => 'print').first.id,
-            :language_id => language_id,
-            :isbn => isbn,
-            :pub_date => pub_date,
-            :nbn => nbn,
-            :ndc => ndc
-          )
-          manifestation.ndc = ndc
-          manifestation.publishers << publisher_patrons
-        end
-        #manifestation.send_later(:create_frbr_instance, doc.to_s)
-        create_frbr_instance(doc, manifestation)
-        return manifestation
-      end
-      def import_isbn!(isbn)
-        manifestation = import_isbn(isbn)
-        manifestation.save!
-        manifestation
-      end
-      def create_frbr_instance(doc, manifestation)
-        title = get_title(doc)
-        creators = get_creators(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
-        language = get_language(doc)
-        subjects = get_subjects(doc)
-        Patron.transaction do
-          creator_patrons = Patron.import_patrons(creators)
-          language_id = Language.where(:iso_639_2 => language).first.id rescue 1
-          content_type_id = ContentType.where(:name => 'text').first.id rescue 1
-          manifestation.creators << creator_patrons
-          if defined?(Subject)
-            subjects.each do |term|
-              subject = Subject.where(:term => term).first
-              manifestation.subjects << subject if subject
-            end
-          end
-        end
-      end
-      def search_porta(query, options = {})
-        options = {:item => 'any', :startrecord => 1, :per_page => 10, :raw => false}.merge(options)
-        doc = nil
-        results = {}
-        startrecord = options[:startrecord].to_i
-        if startrecord == 0
-          startrecord = 1
-        end
-        url = "http://api.porta.ndl.go.jp/servicedp/opensearch?dpid=#{options[:dpid]}&#{options[:item]}=#{URI.escape(query)}&cnt=#{options[:per_page]}&idx=#{startrecord}"
-        if options[:raw] == true
-          open(url).read
-        else
-          RSS::Rss::Channel.install_text_element("openSearch:totalResults", "http://a9.com/-/spec/opensearchrss/1.0/", "?", "totalResults", :text, "openSearch:totalResults")
-          RSS::BaseListener.install_get_text_element "http://a9.com/-/spec/opensearchrss/1.0/", "totalResults", "totalResults="
-          feed = RSS::Parser.parse(url, false)
-        end
-      end
-      def normalize_isbn(isbn)
-        if isbn.length == 10
-          ISBN_Tools.isbn10_to_isbn13(isbn)
-        else
-          ISBN_Tools.isbn13_to_isbn10(isbn)
-        end
-      end
-      def return_xml(isbn)
-        xml = self.search_porta(isbn, {:dpid => 'zomoku', :item => 'isbn', :raw => true}).to_s
-        doc = Nokogiri::XML(xml)
-        if doc.at('//openSearch:totalResults').content.to_i == 0
-          isbn = normalize_isbn(isbn)
-          xml = self.search_porta(isbn, {:dpid => 'zomoku', :item => 'isbn', :raw => true}).to_s
-          doc = Nokogiri::XML(xml)
-        end
-        doc
-      end
-      private
-      def get_title(doc)
-        title = {
-          :manifestation => doc.xpath('//item[1]/title').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
-          :transcription => doc.xpath('//item[1]/dcndl:titleTranscription').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
-          :original => doc.xpath('//dcterms:alternative').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' ')
-        }
-      end
-      def get_creators(doc)
-        creators = []
-        doc.xpath('//item[1]/dc:creator[@xsi:type="dcndl:NDLNH"]').each do |creator|
-          creators << creator.content.gsub('‖', '').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ')
-        end
-        creators
-      end
-      def get_subjects(doc)
-        subjects = []
-        doc.xpath('//item[1]/dc:subject[@xsi:type="dcndl:NDLSH"]').each do |subject|
-          subjects << subject.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
-        end
-        return subjects
-      end
-      def get_language(doc)
-        # TODO: 言語が複数ある場合
-        language = doc.xpath('//item[1]/dc:language[@xsi:type="dcterms:ISO639-2"]').first.content.downcase
-      end
-      def get_publishers(doc)
-        publishers = []
-        doc.xpath('//item[1]/dc:publisher').each do |publisher|
-          publishers << publisher.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
-        end
-        return publishers
-      end
-    end
-    class AlreadyImported < StandardError
-    end
-  end
-end