enju_ndl 0.0.17 → 0.0.18

data/app/models/ndl_book.rb

@@ -6,7 +6,6 @@ class NdlBook
       page = 1 if page.to_i < 1
       idx = (page.to_i - 1) * cnt + 1
       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
 
@@ -24,7 +23,8 @@ class NdlBook
     manifestation = Manifestation.where(:nbn => jpno).first
     return if manifestation
     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')
+    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)

data/lib/enju_ndl/engine.rb

@@ -5,6 +5,7 @@ require 'isbn/tools'
 require 'acts_as_list'
 require 'attribute_normalizer'
 require 'library_stdnums'
+require 'enju_subject'
 
 module EnjuNdl
   class Engine < Rails::Engine

data/lib/enju_ndl/ndl_search.rb

@@ -124,9 +124,24 @@ module EnjuNdl
           content_type_id = ContentType.where(:name => 'text').first.id rescue 1
           manifestation.creators << creator_patrons
           if defined?(Subject)
+            subject_heading_type = SubjectHeadingType.where(:name => 'ndlsh').first
+            unless subject_heading_type
+              subject_heading_type = SubjectHeadingType.create!(:name => 'ndlsh')
+            end
             subjects.each do |term|
-              subject = Subject.where(:term => term).first
-              manifestation.subjects << subject if subject
+              subject = Subject.where(:term => term[:term]).first
+              unless subject
+                subject = Subject.new(term)
+                subject.subject_type = SubjectType.find(1)
+                subject.save!
+              end
+              if subject.valid?
+                manifestation.subjects << subject
+                SubjectHeadingTypeHasSubject.create(
+                  :subject => subject,
+                  :subject_heading_type => subject_heading_type
+                )
+              end
             end
           end
         end
@@ -192,8 +207,11 @@ module EnjuNdl
 
       def get_subjects(doc)
         subjects = []
-        doc.xpath('//dcterms:subject/rdf:Description/rdf:value').each do |subject|
-          subjects << subject.content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 ')
+        doc.xpath('//dcterms:subject/rdf:Description').each do |subject|
+          subjects << {
+            :term => subject.at('./rdf:value').content.tr('ａ-ｚＡ-Ｚ０-９　‖', 'a-zA-Z0-9 '),
+            #:url => subject.attribute('about').try(:content)
+          }
         end
         return subjects
       end

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70096488387820 !ruby/object:Gem::Requirement
+  requirement: &70255622541220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488387820
+  version_requirements: *70255622541220
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70096488387400 !ruby/object:Gem::Requirement
+  requirement: &70255622540780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488387400
+  version_requirements: *70255622540780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70096488386940 !ruby/object:Gem::Requirement
+  requirement: &70255622540260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488386940
+  version_requirements: *70255622540260
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70096488386440 !ruby/object:Gem::Requirement
+  requirement: &70255622539720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488386440
+  version_requirements: *70255622539720
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70096488386020 !ruby/object:Gem::Requirement
+  requirement: &70255622539120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488386020
+  version_requirements: *70255622539120
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70096488385560 !ruby/object:Gem::Requirement
+  requirement: &70255622538540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488385560
+  version_requirements: *70255622538540
 - !ruby/object:Gem::Dependency
   name: library_stdnums
-  requirement: &70096488385140 !ruby/object:Gem::Requirement
+  requirement: &70255622537780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096488385140
+  version_requirements: *70255622537780
+- !ruby/object:Gem::Dependency
+  name: enju_subject
+  requirement: &70255622537320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70255622537320
+- !ruby/object:Gem::Dependency
+  name: sunspot_rails
+  requirement: &70255622553260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70255622553260
+- !ruby/object:Gem::Dependency
+  name: sunspot_solr
+  requirement: &70255622552560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70255622552560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70096488384720 !ruby/object:Gem::Requirement
+  requirement: &70255622551600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096488384720
+  version_requirements: *70255622551600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70096488384300 !ruby/object:Gem::Requirement
+  requirement: &70255622550820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096488384300
+  version_requirements: *70255622550820
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp