traject_horizon 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cb3c476d097c01756f8551892e60548f2475bd
-  data.tar.gz: 50a3e43485c851c116395f4e3f884a1686eda7de
+  metadata.gz: 5437d552f50c5c1cac65863a57062d0a923003dc
+  data.tar.gz: 465ec4110061d6c7da26c02c83f05ae710fdbd75
 SHA512:
-  metadata.gz: c4166a656eef570fb02e38d02c8ebe5e781ece32f729bf1a28c6cd5f894108b4abae92454fe0369ffdc2f9a52435d3b50b896f8a5b10e34f45ffdb10ab9e6961
-  data.tar.gz: 03acb1cd5d30486a4512bb34a583dcc23d0883e339e3b3a5937b00d5f00a1580ebfcd1a275f72170dda5335f09c3cc748f90e43107474c3db53b4553a200e916
+  metadata.gz: 725bfb474a7ca9376e2ba725d201747ae8029bc38fb9a80b9a54508a2a42f1d587f1827ec11615d039b392b15d633a3c03a4cb18a8550bf2855874f5e33d56ea
+  data.tar.gz: 4c0e28e6f2baea56449e4961f642468761d49106cb22f06cb25516be162ab7186dedf570dc69ca083824bfc31cce79f64a2286f61b47f87b818458493eca0f64

data/lib/traject/horizon_bib_auth_merge.rb

@@ -10,6 +10,8 @@ module Traject
   class HorizonBibAuthMerge
     attr_reader :bibtext, :authtext, :tag
 
+    @@up_to_subfield_t_re = /\A(.*)\x1Ft/ 
+
     # Pass in bibtext and authtext as String -- you probably need to get
     # column values from JDBC as bytes and then use String.from_java_bytes
     # to avoid messing up possible Marc8 encoding.
@@ -43,6 +45,13 @@ module Traject
       return bibtext  if authtext.nil?
 
 
+      # For 240 and 243, it seems that anything before the first $t should
+      # be ignored in authtext template -- we need to actually remove it, 
+      # so later when we append any leftover fields, we don't get those. 
+      if tag == '240' || tag == '243'
+        authtext.sub!(@@up_to_subfield_t_re, "\x1Ft")
+      end
+
 
       # We need to do a crazy combination of template in text with values in authtext.
       # horizon, you so crazy. text template is like:
@@ -114,6 +123,17 @@ module Traject
         end
       end
 
+      # Sometimes there's leftover text at the end of authtext that wasn't 
+      # included in the bibtext template. Horizon's marc reconstruction
+      # seems to just include this on the end, we will too. 
+      # Relies on 'prior to $t' fields being removed from 240 and 243 earlier,
+      # to avoid including them when we shouldn't. 
+      if authtext.length > 0
+        bibtext << authtext
+      end
+
+
+
       # We mutated bibtext to fill in template, now just return it.
       return bibtext
     end

data/lib/traject_horizon/version.rb

@@ -1,3 +1,3 @@
 module TrajectHorizon
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/test/horizon_bib_auth_merge_test.rb

@@ -55,4 +55,9 @@ describe "HorizonBibAuthMerge" do
     assert_equal "aMiscellaneous publications (Pan American Sanitary Bureau) ;vno. 79.", HzMerge.new("830", "a) ;vno. 79.", "aMiscellaneous publications (Pan American Sanitary Bureau) ;").merge!
   end
 
+  it "handles extra literals in authtext" do
+    assert_equal "aKapsperger, Giovanni Girolamo,d1580-1651.tArie passeggiate.nlibro 1.pUltimi miei sospiri.", 
+      HzMerge.new("700", "a,d.t.", "aKapsperger, Giovanni Girolamo,d1580-1651.tArie passeggiate,nlibro 1.pUltimi miei sospiri.").merge!
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traject_horizon
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: traject