enju_ndl 0.1.0.pre16 → 0.1.0.pre17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30bcd302d1a7555044730c4eaf2847a1ffc8aaf
-  data.tar.gz: 5996038247ff243245f2b2fb5d6d649b36aa985f
+  metadata.gz: 7440506c610a3cdc7455dde95874262a99f7fba2
+  data.tar.gz: df84a8f2a5e4e1bea8a3e7a9945b67a30cc801f9
 SHA512:
-  metadata.gz: bc3164372c5764496eadefb815a60781a918ff7ae04e6c46de3456d7d8bf266bd556e43f8e42282fa575014fe320b5e310407add9210018ad4837a9a9baabf92
-  data.tar.gz: 9f57ba3ea0505c1b45da23a25940c7013fa7bd6e382907055d645b466734cf8ba4b497ce83618572c62f578e58e02f722ebb83b5e794880f2e46572946cf9be4
+  metadata.gz: 0803f949b3c97530cf67512b3444ddef0466c76f7ff1a0007705ef4879f78e771d351aa0adbbd000340a7498f1331ce0e7b32bf58b2e0d9ddb4589b52c06cc36
+  data.tar.gz: 52b69f574cd8eb61fd378c6ae05491882be6b37a627745f2ea64bb3ded0ce2ef9371739eba475f969c02b25a9817fe8423e4149f341dfc42df49c52246355af5

data/lib/enju_ndl/ndl_search.rb

@@ -54,19 +54,6 @@ module EnjuNdl
 
         isbn = Lisbn.new(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content).to_s).try(:isbn)
         issn_l = StdNum::ISSN.normalize(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(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
-          if ndc9_url
-            ndc = ndc9_url.path.split('/').last
-            classification_type = ClassificationType.where(:name => 'ndc9').first
-            unless classification_type
-              classification_type = ClassificationType.create!(:name => 'ndc9', :display_name => 'NDC9')
-            end
-            classification = Classification.new(:category => ndc)
-            classification.classification_type = classification_type
-          end
-        end
 
         carrier_type = content_type = nil
         doc.xpath('//dcndl:materialType[@rdf:resource]').each do |d|
@@ -118,7 +105,6 @@ module EnjuNdl
             manifestation.publishers << publisher_patrons
             create_additional_attributes(doc, manifestation)
             create_series_statement(doc, manifestation)
-            manifestation.classifications << classification if classification
           end
         end
 
@@ -132,6 +118,7 @@ module EnjuNdl
         language = get_language(doc)
         subjects = get_subjects(doc).uniq
         classifications = get_classifications(doc).uniq
+        classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
 
         Patron.transaction do
           creator_patrons = Patron.import_patrons(creators)
@@ -156,6 +143,19 @@ module EnjuNdl
                 subject.subject_heading_types << subject_heading_type if subject.subject_heading_types.where(:id => subject_heading_type.id).empty?
               end
             end
+            if classification_urls
+              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
+                classification_type = ClassificationType.where(:name => 'ndc9').first
+                unless classification_type
+                  classification_type = ClassificationType.create!(:name => 'ndc9', :display_name => 'NDC9')
+                end
+                classification = Classification.new(:category => ndc)
+                classification.classification_type = classification_type
+                manifestation.classifications << classification if classification
+              end
+            end
           end
         end
       end

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre16"
+  VERSION = "0.1.0.pre17"
 end

data/spec/dummy/config/application.rb

@@ -46,3 +46,4 @@ module Dummy
 end
 
 require 'enju_biblio'
+require 'enju_subject'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre16
+  version: 0.1.0.pre17
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: enju_subject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +150,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0.pre36
-- !ruby/object:Gem::Dependency
-  name: enju_subject
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: enju_question
   requirement: !ruby/object:Gem::Requirement