enju_ndl 0.0.4 → 0.0.5

data/app/models/ndl_book.rb

@@ -21,7 +21,7 @@ class NdlBook
   end
 
   def self.find_by_isbn(isbn)
-    url = "http://api.porta.ndl.go.jp/servicedp/opensearch?dpid=zomoku&isbn=#{isbn}&cnt=1&idx=1"
+    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')
@@ -36,47 +36,11 @@ class NdlBook
   def self.import_from_sru_response(jpno)
     manifestation = Manifestation.where(:nbn => jpno).first
     return if manifestation
-    response = Nokogiri::XML(open("http://api.porta.ndl.go.jp/servicedp/SRUDp?operation=searchRetrive&maximumRecords=10&recordSchema=dcndl_porta&query=%28jpno=#{jpno}%29")).at('//xmlns:recordData', 'xmlns' => "http://www.loc.gov/zing/srw/")
+    url = "http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&&maximumRecords=1&&query=%28jpno=#{jpno}%29"
+    response = Nokogiri::XML(open("http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&&maximumRecords=1&&query=%28jpno=#{jpno}%29")).at('//xmlns:recordData')
     return unless response.content
     doc = Nokogiri::XML(response.content)
-    title = {
-      :manifestation => doc.xpath('//dc:title').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
-      :transcription => doc.xpath('//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(' ')
-    }
-    lang = doc.at('//dc:language[@xsi:type="dcterms:ISO639-2"]').try(:content)
-    creators = []
-    doc.xpath('//dc:creator[@xsi:type="dcndl:NDLNH"]').each do |creator|
-      creators << creator.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
-    end
-    publishers = []
-    doc.xpath('//dc:publisher').each do |publisher|
-      publishers << publisher.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
-    end
-    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
-
-    Manifestation.transaction do
-      language = Language.where(:iso_639_2 => lang.downcase).first if lang
-      manifestation = Manifestation.new(
-        :original_title => title[:manifestation],
-        :title_transcription => title[:title_transcription],
-        :title_alternative => title[:original],
-        :pub_date => pub_date,
-        :isbn => doc.at('//dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content),
-        :nbn => doc.at('//dc:identifier[@xsi:type="dcndl:JPNO"]').content,
-        :ndc => doc.at('//dc:subject[@xsi:type="dcndl:NDC"]').try(:content).try(:tr, '０-９．', '0-9.').to_s.gsub(/（.*）/, '')
-      )
-      manifestation.language = language if language
-      patron_creators = Patron.import_patrons(creators.zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}).uniq
-      patron_publishers = Patron.import_patrons(publishers.zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}).uniq
-      manifestation.creators << patron_creators
-      manifestation.publishers << patron_publishers
-      manifestation.save!
-    end
-    manifestation
+    Manifestation.import_record(doc)
   end
 
   attr_accessor :url

data/lib/enju_ndl/ndl_search.rb

@@ -14,10 +14,13 @@ module EnjuNdl
         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
+        #raise EnjuNdl::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
+        import_record(doc)
+      end
 
-        pub_date, language, nbn = nil, nil, nil
+      def import_record(doc)
+        pub_date, language, nbn, ndc, isbn = nil, nil, nil, nil, nil
 
         publishers = get_publishers(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
 
@@ -31,10 +34,18 @@ module EnjuNdl
         end
 
         language = get_language(doc)
+        isbn = doc.at('./dc:identifier[@xsi:type="dcndl:ISBN"]').try(:content).to_s
         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
+        if classification_urls
+          ndc9_url = classification_urls.map{|url| URI.parse(url)}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
+          if ndc9_url
+            ndc = ndc9_url.path.split('/').last
+          end
+        end
+        description = doc.at('//dcterms:abstract').try(:content)
 
+        manifestation = nil
         Patron.transaction do
           publisher_patrons = Patron.import_patrons(publishers)
           language_id = Language.where(:iso_639_2 => language).first.id rescue 1
@@ -47,15 +58,15 @@ module EnjuNdl
             :language_id => language_id,
             :isbn => isbn,
             :pub_date => pub_date,
+            :description => description,
             :nbn => nbn,
             :ndc => ndc
           )
-          manifestation.ndc = ndc
           manifestation.publishers << publisher_patrons
+          create_frbr_instance(doc, manifestation)
         end
 
         #manifestation.send_later(:create_frbr_instance, doc.to_s)
-        create_frbr_instance(doc, manifestation)
         return manifestation
       end
 

data/lib/enju_ndl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70123411904400 !ruby/object:Gem::Requirement
+  requirement: &70273563941240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70123411904400
+  version_requirements: *70273563941240
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70123411918620 !ruby/object:Gem::Requirement
+  requirement: &70273563940820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123411918620
+  version_requirements: *70273563940820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70123411945180 !ruby/object:Gem::Requirement
+  requirement: &70273563940360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123411945180
+  version_requirements: *70273563940360
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70123411964080 !ruby/object:Gem::Requirement
+  requirement: &70273563939860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123411964080
+  version_requirements: *70273563939860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70123412083020 !ruby/object:Gem::Requirement
+  requirement: &70273563939440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123412083020
+  version_requirements: *70273563939440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70123412079920 !ruby/object:Gem::Requirement
+  requirement: &70273563938980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123412079920
+  version_requirements: *70273563938980
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp