enju_ndl 0.1.0.pre20 → 0.1.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2aa3ca95edd0d99542de23296cff581d1a3200
-  data.tar.gz: b6be5ee4f709e1552c650bfb134a6c5e617e2fb7
+  metadata.gz: fe6c232bbe1c2eb8ad59591b0224f985f200760f
+  data.tar.gz: 3e4e0c5fbeb4a8e5648ee9108d04414a74db400f
 SHA512:
-  metadata.gz: f727978dc92a297600878a0b7ce55e1c9f7a70c0a3068a85701567e868bea978ebfdb784692311d9406f760f8b045c4d11cb097dcf88c3c440027f3b58a4320b
-  data.tar.gz: e75f87e0759fa1f76dc75a51238167262c79a9d244b761d2b60287a917c09f90bd19b0c720c4f69a552ce19c7557a61b45941751dffb487f5db1df2bd9ea5a42
+  metadata.gz: 2eed2d32e2004bb1fe90dd9f5cf1a1175b915c936742f52b120ce80fcad07e77adf3be46c25ad99e0269f007a4e5088d03021f4f0e8e0f536740c832413d0264
+  data.tar.gz: 5026816a1a84a5a6ee8be54f8c913489fb3bece50af68ca79b9e637884d5b5b435ddd1bf3d4c360f914ad240c7e95efaf99f13386e76cafa1b9b1e5f7bd828aa

data/app/helpers/ndl_books_helper.rb

@@ -4,7 +4,10 @@ module NdlBooksHelper
     if nbn.blank?
       t('enju_ndl.not_available')
     else
-      manifestation = Manifestation.where(:nbn => nbn).first
+      identifier_type = IdentifierType.where(:name => 'nbn').first
+      if identifier_type
+        manifestation = Identifier.where(:body => nbn, :identifier_type_id => identifier_type.id).first.try(:manifestation)
+      end
       unless manifestation
         link_to t('enju_ndl.add'), ndl_books_path(:book => {:nbn => nbn}), :method => :post
       else

data/lib/enju_ndl/ndl_search.rb

@@ -76,7 +76,7 @@ module EnjuNdl
           end
         end
 
-        identifier = doc.at('//dcndl:BibAdminResource[@rdf:about]').attributes["about"].value
+        admin_identifier = doc.at('//dcndl:BibAdminResource[@rdf:about]').attributes["about"].value
         description = doc.at('//dcterms:abstract').try(:content)
         price = doc.at('//dcndl:price').try(:content)
         volume_number_string = doc.at('//dcndl:volume/rdf:Description/rdf:value').try(:content)
@@ -88,7 +88,7 @@ module EnjuNdl
           publisher_patrons = Patron.import_patrons(publishers)
 
           manifestation = Manifestation.new(
-            :manifestation_identifier => identifier,
+            :manifestation_identifier => admin_identifier,
             :original_title => title[:manifestation],
             :title_transcription => title[:transcription],
             :title_alternative => title[:alternative],
@@ -126,7 +126,7 @@ module EnjuNdl
           manifestation.periodical = true if publication_periodicity
           if manifestation.save
             identifier.each do |k, v|
-              manifestation.identifiers << v
+              manifestation.identifiers << v if v.valid?
             end
             manifestation.publishers << publisher_patrons
             create_additional_attributes(doc, manifestation)

data/lib/enju_ndl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre20
+  version: 0.1.0.pre21
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre37
+        version: 0.1.0.pre38
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre37
+        version: 0.1.0.pre38
 - !ruby/object:Gem::Dependency
   name: enju_question
   requirement: !ruby/object:Gem::Requirement