enju_loc 0.1.0.pre1 → 0.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161a209a154952a583d5b7097b1d0095da0799dd
-  data.tar.gz: 28c269f6d80449a75cafc7222fc7e9d0dbab9d47
+  metadata.gz: a96fc7e67fe0bd59c8d602abbc252a3e4640e9d4
+  data.tar.gz: cc88398cf5dc307bedbaba6ae79b2bc73569e84c
 SHA512:
-  metadata.gz: 5f0159d182e91d36adafde8eacd5cba7a9f3a030e16f786d1863372c4dc2c05fb613ecf7f87c11d77a74a898bd4fe5ff0d93c1ee5ea244f10c8ccc44b0f6fec8
-  data.tar.gz: 9f510d2b528a306917ccedd6d824bffa495b0c1529ac4a14e0a3b26a7fd813c66ee30532f59a04594404373e2ed6e8c0b9b50e3948fbf290c24acacee6cf792c
+  metadata.gz: 1676940930988bf9125d05633c08256cac1aa6529596c9d4235ff27e566e444024ee254287aa155f7e21a96062a39808b8517765fa110006f4efe73bbc02aed2
+  data.tar.gz: ff731a127de5d1c42b77d88b1e491d694ad97bf5a91ed0932ba96d4074bbd603cde6cb4413d7ab295cc907e7935f956f8c9907d8f84319dc54e6253a22ae4f9f

data/app/models/loc_search.rb

@@ -13,6 +13,9 @@ class LocSearch
     def lccn
       @node.xpath( './/mods:mods/mods:identifier[@type="lccn"]', MODS_NS ).first.try( :content )
     end
+    def isbn
+      @node.xpath( './/mods:mods/mods:identifier[@type="isbn"]', MODS_NS ).first.try( :content )
+    end
     def creator
       statement_of_responsibility = @node.at('.//mods:note[@type="statement of responsibility"]',MODS_NS).try(:content)
       if statement_of_responsibility

data/app/views/loc_search/index.html.erb

@@ -24,8 +24,13 @@
     <td>
       <strong><%= link_to_unless( book.lccn.blank?, book.title, "http://lccn.loc.gov/#{ book.lccn }" ) do book.title end %></strong><br />
       <%=h book.creator -%><br />
+      <% if book.publisher.present? %>
       <%=h book.publisher -%>,
+      <% end %>
       <%=h book.pubyear -%>
+      <% if book.isbn.present? %>
+      (ISBN: <%=h book.isbn -%>)
+      <% end %>
     </td>
   </tr>
 <% end -%>

data/lib/enju_loc/loc_search.rb

@@ -47,15 +47,15 @@ module EnjuLoc
           }
         end
 
-        creators = get_creators(doc)
+        creators = get_mods_creators(doc)
 
         # title
-        titles = get_titles(doc)
+        titles = get_mods_titles(doc)
 
         # date of publication
-        date = get_date_of_publication(doc)
+        date = get_mods_date_of_publication(doc)
 
-        language = Language.where(:iso_639_2 => get_language(doc)).first
+        language = Language.where(:iso_639_2 => get_mods_language(doc)).first
         if language
           language_id = language.id
         else
@@ -67,21 +67,21 @@ module EnjuLoc
         issn = StdNum::ISSN.normalize(doc.at('/mods:mods/mods:identifier[@type="issn"]',NS).try(:content).to_s)
         issn_l = StdNum::ISSN.normalize(doc.at('/mods:mods/mods:identifier[@type="issn-l"]',NS).try(:content).to_s)
 
-	types = get_carrier_and_content_types( doc )
+	types = get_mods_carrier_and_content_types( doc )
 	content_type = types[ :content_type ]
 	carrier_type = types[ :carrier_type ]
 
 	record_identifier = doc.at('//mods:recordInfo/mods:recordIdentifier',NS).try(:content)
         description = doc.xpath('//mods:abstract',NS).collect(&:content).join("\n")
         edition_string = doc.at('//mods:edition',NS).try(:content)
-        extent = get_extent(doc)
-	note = get_note(doc)
-        frequency = get_frequency(doc)
+        extent = get_mods_extent(doc)
+	note = get_mods_note(doc)
+        frequency = get_mods_frequency(doc)
 	issuance = doc.at('//mods:issuance',NS).try(:content)
 	is_serial = true if issuance == "serial"
-        statement_of_responsibility = get_statement_of_responsibility(doc)
-	access_address = get_access_address(doc)
-	publication_place = get_publication_place(doc)
+        statement_of_responsibility = get_mods_statement_of_responsibility(doc)
+	access_address = get_mods_access_address(doc)
+	publication_place = get_mods_publication_place(doc)
 
         manifestation = nil
         Agent.transaction do
@@ -147,8 +147,8 @@ module EnjuLoc
 
       private
       def create_subject_related_elements(doc, manifestation)
-	subjects = get_subjects(doc)
-	classifications = get_classifications(doc)
+	subjects = get_mods_subjects(doc)
+	classifications = get_mods_classifications(doc)
 	if defined?(EnjuSubject)
           subject_heading_type = SubjectHeadingType.where(:name => 'lcsh').first_or_create
           subjects.each do |term|
@@ -190,7 +190,7 @@ module EnjuLoc
       end
       
       def create_series_master(doc, manifestation)
-        titles = get_titles(doc)
+        titles = get_mods_titles(doc)
 	series_statement = SeriesStatement.new(
 	  :original_title => titles[:original_title],
 	  :title_alternative => titles[:title_alternative],
@@ -201,7 +201,7 @@ module EnjuLoc
 	end
       end
 
-      def get_titles(doc)
+      def get_mods_titles(doc)
 	original_title = ""
 	title_alternatives = []
 	doc.xpath('//mods:mods/mods:titleInfo',NS).each do |e|
@@ -224,11 +224,11 @@ module EnjuLoc
 	{ :original_title => original_title, :title_alternative => title_alternatives.join( " ; " ) }
       end
 
-      def get_language(doc)
+      def get_mods_language(doc)
 	language = doc.at('//mods:language/mods:languageTerm[@authority="iso639-2b"]',NS).try(:content)
       end
 
-      def get_access_address(doc)
+      def get_mods_access_address(doc)
 	access_address = nil
 	url = doc.at('//mods:location/mods:url',NS)
 	if url
@@ -241,11 +241,11 @@ module EnjuLoc
 	access_address
       end
 
-      def get_publication_place(doc)
+      def get_mods_publication_place(doc)
 	place = doc.at('//mods:originInfo/mods:place/mods:placeTerm[@type="text"]',NS).try(:content)
       end
 
-      def get_extent(doc)
+      def get_mods_extent(doc)
         extent = doc.at('//mods:extent',NS).try(:content)
         value = {:start_page => nil, :end_page => nil, :height => nil}
         if extent
@@ -263,17 +263,14 @@ module EnjuLoc
         value
       end
 
-      def get_statement_of_responsibility(doc)
+      def get_mods_statement_of_responsibility(doc)
 	note = doc.at('//mods:note[@type="statement of responsibility"]',NS).try(:content)
-	if note
-	  note
-	else
-	  doc.xpath('/mods:mods/mods:name',NS).map do |n|
-	    n.at('./mods:namePart',NS).try(:content)
-	  end.join( "; " )
+	if note.blank?
+	  note = get_mods_creators(doc).map{|e| e[:full_name] }.join( " ; " )
 	end
+	note
       end
-      def get_note(doc)
+      def get_mods_note(doc)
         notes = []
 	doc.xpath('//mods:note',NS).each do |note|
 	  type = note.attributes['type'].try(:content)
@@ -287,7 +284,7 @@ module EnjuLoc
 	  notes.join( ";\n" )
 	end
       end
-      def get_date_of_publication(doc)
+      def get_mods_date_of_publication(doc)
         dates = []
 	doc.xpath('//mods:dateIssued',NS).each do |pub_date|
 	  pub_date = pub_date.content.sub( /\A[cp]/, '' )
@@ -322,7 +319,7 @@ module EnjuLoc
         "Triennial",
         "Completely irregular",
       ]
-      def get_frequency(doc)
+      def get_mods_frequency(doc)
         frequencies = []
 	doc.xpath('//mods:frequency',NS).each do |freq|
 	  frequency = freq.try(:content)
@@ -336,7 +333,7 @@ module EnjuLoc
 	frequencies.compact.first
       end
 
-      def get_creators(doc)
+      def get_mods_creators(doc)
 	creators = []
         doc.xpath('/mods:mods/mods:name',NS).each do |creator|
 	  creators << {
@@ -347,7 +344,7 @@ module EnjuLoc
       end
 
       # TODO:only LCSH-based parsing...
-      def get_subjects(doc)
+      def get_mods_subjects(doc)
 	subjects = []
 	doc.xpath('//mods:subject[@authority="lcsh"]',NS).each do |s|
 	  subject = []
@@ -375,7 +372,7 @@ module EnjuLoc
       end
 
       # TODO:support only DDC.
-      def get_classifications(doc)
+      def get_mods_classifications(doc)
 	classifications = []
 	doc.xpath('//mods:classification[@authority="ddc"]',NS).each do|c|
 	  ddc = c.content
@@ -386,7 +383,7 @@ module EnjuLoc
 	classifications.compact
       end
 
-      def get_carrier_and_content_types(doc)
+      def get_mods_carrier_and_content_types(doc)
         carrier_type = content_type = nil
         doc.xpath('//mods:form',NS).each do |e|
           authority = e.attributes['authority'].try(:content)
@@ -394,86 +391,99 @@ module EnjuLoc
 	  when "gmd"
 	    case e.content
 	    when "electronic resource"
-	      carrier_type = CarrierType.where(:name => 'file').first
-	    when "videorecording"
-              content_type = ContentType.where(:name => 'video').first
-	    #TODO: Enju needs more specific mappings...
-	    when "art original"
-	    when "microscope slides"
-	    when "art reproduction"
-	    when "model"
-	    when "chart"
-	    when "motion picture"
-	    when "diorama"
-	    when "picture"
-	    when "realia"
-	    when "filmstrip"
-	    when "slide"
-	    when "flash card"
+	      carrier_type = CarrierType.where(:name => 'online_resource').first
+	    when "videorecording", "motion picture", "game"
+              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
 	    when "sound recording"
-	    when "game"
-	    when "technical drawing"
-	    when "graphic"
-	    when "toy"
-	    when "kit"
-	    when "transparency"
-	    when "microform"
+              content_type = ContentType.where(:name => 'performed_music').first
+	    when "graphic", "picture"
+	      content_type = ContentType.where(:name => 'still_image').first
+	    #TODO: Enju needs more specific mappings...
+	    when "art original",
+	    	 "microscope slides",
+	    	 "art reproduction",
+	    	 "model",
+	    	 "chart",
+	    	 "diorama",
+	    	 "realia",
+	    	 "filmstrip",
+	    	 "slide",
+	    	 "flash card",
+	    	 "technical drawing",
+	    	 "toy",
+	    	 "kit",
+	    	 "transparency",
+	    	 "microform"
+	      content_type = ContentType.where(:name => 'other').first
 	    end
 	  when "marcsmd" # cf.http://www.loc.gov/standards/valuelist/marcsmd.html
 	    case e.content
-            when "text", "braille", "large print", "regular print", "text in looseleaf binder"
-              carrier_type = CarrierType.where(:name => 'print').first
+            when "text", "large print", "regular print", "text in looseleaf binder"
+              carrier_type = CarrierType.where(:name => 'volume').first
               content_type = ContentType.where(:name => 'text').first
-	    when "videorecording", "videocartridge", "videocassette", "videodisc", "videoreel"
-              content_type = ContentType.where(:name => 'video').first
-	    when "electronic resource", "chip cartridge", "computer optical disc cartridge", "magnetic disk", "magneto-optical disc", "optical disc", "remote", "tape cartridge", "tape cassette", "tape reel"
-	      carrier_type = CarrierType.where(:name => 'file').first
+	    when "braille"
+              carrier_type = CarrierType.where(:name => 'volume').first
+              content_type = ContentType.where(:name => 'tactile_text').first
+	    when "videodisc"
+              carrier_type = CarrierType.where(:name => 'videodisc').first
+              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
+	    when "videorecording", "videocartridge", "videocassette", "videoreel"
+              carrier_type = CarrierType.where(:name => 'other').first
+              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
+	    when "electronic resource"
+	      carrier_type = CarrierType.where(:name => 'online_resource').first
+	    when "chip cartridge", "computer optical disc cartridge", "magnetic disk", "magneto-optical disc", "optical disc", "remote", "tape cartridge", "tape cassette", "tape reel"
+	      #carrier_type = CarrierType.where(:name => 'other').first
 	    when "motion picture", "film cartridge", "film cassette", "film reel"
-              content_type = ContentType.where(:name => 'video').first
-	    when "sound recording", "cylinder", "roll ", "sound cartridge", "sound cassette ", "sound disc ", "sound-tape reel", "sound-track film ", "wire recording" 
-	      conrent_type = ContentType.where(:name => 'audio').first
-	    #when "nonprojected graphic", "chart", "collage", "drawing", "flash card", "painting", "photomechanical print", "photonegative", "photoprint", "picture", "print", "technical drawing", "projected graphic", "filmslip", "filmstrip cartridge", "filmstrip roll", "other filmstrip type ", "slide", "transparency"
-            #  content_type = ContentType.where(:name => 'image').first
+              content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
+	    when "sound recording", "cylinder", "roll", "sound cartridge", "sound cassette","sound-tape reel", "sound-track film", "wire recording" 
+	      content_type = ContentType.where(:name => 'performed_music').first
+	    when "sound disc"
+	      content_type = ContentType.where(:name => 'performed_music').first
+	      carrier_type = CarrierType.where(:name => 'audio_disc').first
+	    when "nonprojected graphic", "chart", "collage", "drawing", "flash card", "painting", "photomechanical print", "photonegative", "photoprint", "picture", "print", "technical drawing", "projected graphic", "filmslip", "filmstrip cartridge", "filmstrip roll", "other filmstrip type ", "slide", "transparency"
+              content_type = ContentType.where(:name => 'still_image').first
+	    when "tactile material", "braille", "tactile, with no writing system"
+	      content_type = ContentType.where(:name => 'tactile_text').first
 	    #TODO: Enju needs more specific mappings...
-	    when "globe"
-	    when "celestial globe"
-	    when "earth moon globe"
-	    when "planetary or lunar globe"
-	    when "terrestrial globe"
-	    when "map"
-	    when "atlas"
-	    when "diagram"
-	    when "map"
-	    when "model"
-	    when "profile "
-	    when "remote-sensing image"
-	    when "section"
-	    when "view"
-	    when "microform"
-	    when "aperture card"
-	    when "microfiche"
-	    when "microfiche cassette"
-	    when "microfilm cartridge"
-	    when "microfilm cassette"
-	    when "microfilm reel"
-	    when "microopaque"
-	    when "tactile material"
-            when "braille"
-            when "combination"
-            when "moon"
-            when "tactile, with no writing system"
+	    when "globe",
+	    	 "celestial globe",
+		 "earth moon globe",
+		 "planetary or lunar globe",
+		 "terrestrial globe",
+		 "map",
+		 "atlas",
+		 "diagram",
+		 "map",
+		 "model",
+		 "profile",
+		 "remote-sensing image",
+		 "section",
+		 "view",
+		 "microform",
+		 "aperture card",
+		 "microfiche",
+		 "microfiche cassette",
+		 "microfilm cartridge",
+		 "microfilm cassette",
+		 "microfilm reel",
+		 "microopaque",
+		 "combination",
+		 "moon"
+              content_type = ContentType.where(:name => 'other').first
 	    end
 	  when "marcform" # cf. http://www.loc.gov/standards/valuelist/marcform.html
 	    case e.content
 	    when "print", "large print"
-              carrier_type = CarrierType.where(:name => 'print').first
+              carrier_type = CarrierType.where(:name => 'volume').first
               content_type = ContentType.where(:name => 'text').first
 	    when "electronic"
-              carrier_type = CarrierType.where(:name => 'file').first
-	    #TODO: Enju needs more specific mappings...
-	    when "microfiche"
+              carrier_type = CarrierType.where(:name => 'online_resource').first
 	    when "braille"
-	    when "microfilm"
+	      content_type = ContentType.where(:name => 'tactile_text').first
+	    #TODO: Enju needs more specific mappings...
+	    when "microfiche", "microfilm"
+	      content_type = ContentType.where(:name => 'other').first
 	    end
 	  end
 	end
@@ -481,54 +491,34 @@ module EnjuLoc
           authority = e.attributes['authority'].try(:content)
 	  case authority
 	  when "rdacontent"
-	    case e.content
-	    when "computer dataset", "computer program"
-              content_type = ContentType.where(:name => 'file').first
-	    when "sounds", "spoken word"
-              content_type = ContentType.where(:name => 'audio').first
-	    when "text"
-              content_type = ContentType.where(:name => 'text').first
-	    when "two-dimensional moving image"
-              content_type = ContentType.where(:name => 'video').first
-	    #TODO: Enju needs more specific mappings...
-	    when "cartographic dataset"
-	    when "cartographic image"
-	    when "cartographic moving image"
-	    when "cartographic tactile image"
-	    when "cartographic tactile three-dimensional form"
-	    when "cartographic three-dimensional form"
-	    when "notated movement"
-	    when "notated music"
-	    when "performed music"
-	    when "still image"
-	    when "tactile image"
-	    when "tactile notated music"
-	    when "tactile notated movement"
-	    when "tactile text"
-	    when "tactile three-dimensional form"
-	    when "three-dimensional form"
-	    when "three-dimensional moving image"
-	    when "other"
-	    when "unspecified"
-            end
+	    content_type = ContentType.where(:name => e.content.gsub(/\W+/, "_")).first
+	    content_type = ContentType.where(:name => 'other').first unless content_type
           end
         end
 	type = doc.at('//mods:typeOfResource',NS).try(:content)
 	case type
 	when "text"
 	  content_type = ContentType.where(:name => 'text').first
-	when "sound recording", "sound recording-musical", "sound recording-nonmusical"
-	  content_type = ContentType.where(:name => 'audio').first
+	when "sound recording"
+	  content_type = ContentType.where(:name => 'sounds').first
+	when"sound recording-musical"
+	  content_type = ContentType.where(:name => 'performed_music').first
+	when"sound recording-nonmusical"
+	  content_type = ContentType.where(:name => 'spoken_word').first
 	when "moving image"
-	  content_type = ContentType.where(:name => 'video').first
+	  content_type = ContentType.where(:name => 'two_dimensional_moving_image').first
 	when "software, multimedia"
-	  carrier_type = ContentType.where(:name => 'file').first
-	#TODO: Enju needs more specific mappings...
+	  content_type = ContentType.where(:name => 'other').first
 	when "cartographic "
+	  content_type = ContentType.where(:name => 'cartographic_image').first
 	when "notated music"
+	  content_type = ContentType.where(:name => 'notated_music').first
 	when "still image"
+	  content_type = ContentType.where(:name => 'still_image').first
 	when "three dimensional object"
+	  content_type = ContentType.where(:name => 'other').first
 	when "mixed material"
+	  content_type = ContentType.where(:name => 'other').first
 	end
         { :carrier_type => carrier_type, :content_type => content_type }
       end

data/lib/enju_loc/version.rb

@@ -1,3 +1,3 @@
 module EnjuLoc
-  VERSION = "0.1.0.pre1"
+  VERSION = "0.1.0.pre2"
 end