enju_ndl 0.1.0.pre19 → 0.1.0.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 505852854109922926380ed50132dd72b5484ca9
-  data.tar.gz: 34e5040dbaf5f59fa8608185e3dce3b32afe73be
+  metadata.gz: ae2aa3ca95edd0d99542de23296cff581d1a3200
+  data.tar.gz: b6be5ee4f709e1552c650bfb134a6c5e617e2fb7
 SHA512:
-  metadata.gz: 658f7b37989e190098bae889a312ec2c54947fef4814767b61b67a449d57dee8323435e780258dae5ed8b12be7f45254c016e6bf01248955292266b2488eb556
-  data.tar.gz: 20dc0bd5fff548c7d7a7fb5fc17b52dcf5f387534575363be4230bed4253a0446a71c46c9ff26a82c5e7e5fbe26f096a9924a02a4c20575c089172adfdb18383
+  metadata.gz: f727978dc92a297600878a0b7ce55e1c9f7a70c0a3068a85701567e868bea978ebfdb784692311d9406f760f8b045c4d11cb097dcf88c3c440027f3b58a4320b
+  data.tar.gz: e75f87e0759fa1f76dc75a51238167262c79a9d244b761d2b60287a917c09f90bd19b0c720c4f69a552ce19c7557a61b45941751dffb487f5db1df2bd9ea5a42

data/app/models/ndl_book.rb

@@ -62,8 +62,8 @@ class NdlBook
   end
 
   def self.import_from_sru_response(jpno)
-    manifestation = Manifestation.where(:nbn => jpno).first
-    return if manifestation
+    identifier = Identifier.where(:body => jpno, :identifier_type_id => IdentifierType.where(:name => 'nbn').first_or_create.id).first
+    return if identifier
     url = "http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&&maximumRecords=1&&query=%28jpno=#{jpno}%29&onlyBib=true"
     xml = open(url).read
     response = Nokogiri::XML(xml).at('//xmlns:recordData')

data/lib/enju_ndl/ndl_search.rb

@@ -6,6 +6,11 @@ module EnjuNdl
     end
 
     module ClassMethods
+      def import_isbn(isbn)
+        manifestation = Manifestation.import_from_ndl_search(:isbn => isbn)
+        manifestation
+      end
+
       def import_from_ndl_search(options)
         #if options[:isbn]
           lisbn = Lisbn.new(options[:isbn])
@@ -13,7 +18,7 @@ module EnjuNdl
         #end
 
         manifestation = Manifestation.find_by_isbn(lisbn.isbn)
-        return manifestation if manifestation
+        return manifestation.first if manifestation.present?
 
         doc = return_xml(lisbn.isbn)
         raise EnjuNdl::RecordNotFound unless doc
@@ -23,8 +28,8 @@ module EnjuNdl
 
       def import_record(doc)
         nbn = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
-        manifestation = Manifestation.where(:nbn => nbn).first if nbn
-        return manifestation if manifestation
+        identifier = Identifier.where(:body => nbn, :identifier_type_id => IdentifierType.where(:name => 'nbn').first_or_create.id).first
+        return identifier.manifestation if identifier
 
         publishers = get_publishers(doc)
 
@@ -53,6 +58,7 @@ module EnjuNdl
         end
 
         isbn = Lisbn.new(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content).to_s).try(:isbn)
+        issn = StdNum::ISSN.normalize(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSN"]').try(:content))
         issn_l = StdNum::ISSN.normalize(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSNL"]').try(:content))
 
         carrier_type = content_type = nil
@@ -75,6 +81,7 @@ module EnjuNdl
         price = doc.at('//dcndl:price').try(:content)
         volume_number_string = doc.at('//dcndl:volume/rdf:Description/rdf:value').try(:content)
         extent = get_extent(doc)
+        publication_periodicity = doc.at('//dcndl:publicationPeriodicity').try(:content)
 
         manifestation = nil
         Patron.transaction do
@@ -89,19 +96,38 @@ module EnjuNdl
             # TODO: NDLサーチに入っている図書以外の資料を調べる
             #:carrier_type_id => CarrierType.where(:name => 'print').first.id,
             :language_id => language_id,
-            :isbn => isbn,
             :pub_date => date,
             :description => description,
             :volume_number_string => volume_number_string,
             :price => price,
-            :nbn => nbn,
             :start_page => extent[:start_page],
             :end_page => extent[:end_page],
             :height => extent[:height]
           )
+          identifier = {}
+          if isbn
+            identifier[:isbn] = Identifier.new(:body => isbn)
+            identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
+          end
+          if nbn
+            identifier[:nbn] = Identifier.new(:body => nbn)
+            identifier[:nbn].identifier_type = IdentifierType.where(:name => 'nbn').first_or_create
+          end
+          if issn
+            identifier[:issn] = Identifier.new(:body => issn)
+            identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn').first_or_create
+          end
+          if issn_l
+            identifier[:issn] = Identifier.new(:body => issn_l)
+            identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn_l').first_or_create
+          end
           manifestation.carrier_type = carrier_type if carrier_type
           manifestation.manifestation_content_type = content_type if content_type
+          manifestation.periodical = true if publication_periodicity
           if manifestation.save
+            identifier.each do |k, v|
+              manifestation.identifiers << v
+            end
             manifestation.publishers << publisher_patrons
             create_additional_attributes(doc, manifestation)
             create_series_statement(doc, manifestation)
@@ -127,21 +153,18 @@ module EnjuNdl
           manifestation.creators << creator_patrons
 
           if defined?(EnjuSubject)
-            subject_heading_type = SubjectHeadingType.where(:name => 'ndlsh').first
-            unless subject_heading_type
-              subject_heading_type = SubjectHeadingType.create!(:name => 'ndlsh')
-            end
+            subject_heading_type = SubjectHeadingType.where(:name => 'ndlsh').first_or_create
             subjects.each do |term|
               subject = Subject.where(:term => term[:term]).first
               unless subject
                 subject = Subject.new(term)
                 subject.subject_heading_type = subject_heading_type
-                subject.subject_type = SubjectType.find(1)
+                subject.subject_type = SubjectType.where(:name => 'concept').first_or_create
               end
-              if subject.valid?
+              #if subject.valid?
                 manifestation.subjects << subject
-              end
-              subject.save!
+              #end
+              #subject.save!
             end
             if classification_urls
               ndc9_url = classification_urls.map{|url| URI.parse(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
@@ -287,8 +310,6 @@ module EnjuNdl
           series_title[:title_transcription] = series[:title_transcription]
         end
 
-        publication_periodicity = doc.at('//dcndl:publicationPeriodicity').try(:content)
-
         if series_title[:title]
           series_statement = SeriesStatement.where(:original_title => series_title[:title]).first
           unless series_statement
@@ -297,17 +318,6 @@ module EnjuNdl
               :title_transcription => series_title[:title_transcription]
             )
           end
-        elsif publication_periodicity
-          issn = StdNum::ISSN.normalize(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSN"]').try(:content))
-          series_statement = SeriesStatement.where(:issn => issn).first
-          unless series_statement
-            series_statement = SeriesStatement.new(
-              :original_title => manifestation.original_title,
-              :title_transcription => manifestation.title_transcription,
-              :issn => issn,
-              :periodical => true
-            )
-          end
         end
 
         if series_statement.try(:save)

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre19"
+  VERSION = "0.1.0.pre20"
 end