enju_ndl 0.0.9 → 0.0.10

data/lib/enju_ndl/ndl_search.rb

@@ -20,7 +20,7 @@ module EnjuNdl
       end
 
       def import_record(doc)
-        pub_date, language, nbn, ndc, isbn = nil, nil, nil, nil, nil
+        pub_date, langugage, nbn, ndc, isbn = nil, nil, nil, nil, nil
 
         publishers = get_publishers(doc).zip([]).map{|f,t| {:full_name => f, :full_name_transcription => t}}
 
@@ -33,7 +33,13 @@ module EnjuNdl
           pub_date = nil
         end
 
-        language = get_language(doc)
+        language = Language.where(:iso_639_2 => get_language(doc)).first
+        if language
+          language_id = language.id
+        else
+          language_id = 1
+        end
+
         isbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content).to_s
         nbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
         classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
@@ -49,7 +55,6 @@ module EnjuNdl
         manifestation = nil
         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],
@@ -141,7 +146,7 @@ module EnjuNdl
       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(' '),
+          :transcription => doc.xpath('//dc:title/rdf:Description/dcndl:transcription').collect(&:content).join(' ').tr('ａ-ｚＡ-Ｚ０-９　', 'a-zA-Z0-9 ').squeeze(' '),
           :alternative => doc.at('//dcndl:alternative/rdf:Description/rdf:value').try(:content),
           :alternative_transcription => doc.at('//dcndl:alternative/rdf:Description/dcndl:transcription').try(:content)
         }
@@ -168,7 +173,10 @@ module EnjuNdl
 
       def get_language(doc)
         # TODO: 言語が複数ある場合
-        language = doc.xpath('//dcterms:language').first.content.downcase
+        language = doc.at('//dcterms:language[@rdf:datatype="http://purl.org/dc/terms/ISO639-2"]').content
+        if language
+          language.downcase
+        end
       end
 
       def get_publishers(doc)

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70116582319300 !ruby/object:Gem::Requirement
+  requirement: &70220379155080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70116582319300
+  version_requirements: *70220379155080
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70116582318700 !ruby/object:Gem::Requirement
+  requirement: &70220379154300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116582318700
+  version_requirements: *70220379154300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70116582342180 !ruby/object:Gem::Requirement
+  requirement: &70220379153460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116582342180
+  version_requirements: *70220379153460
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70116582341340 !ruby/object:Gem::Requirement
+  requirement: &70220379152600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116582341340
+  version_requirements: *70220379152600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70116582340280 !ruby/object:Gem::Requirement
+  requirement: &70220379168500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70116582340280
+  version_requirements: *70220379168500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70116582339360 !ruby/object:Gem::Requirement
+  requirement: &70220379167860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70116582339360
+  version_requirements: *70220379167860
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp