traject 2.0.1-java → 2.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c1c809093189ee211bf8033ec9b15398047c18
-  data.tar.gz: ccf0cde00fad91a001f148dab37f5e613b880234
+  metadata.gz: ce12df11c229a7944a720a3ccb9f4cad8fb37669
+  data.tar.gz: 4ba839a011a55ec5d212d68b4a337a6f7d5cb898
 SHA512:
-  metadata.gz: 0a4c3b7e34b5831a9105648d34ca726bae71dc464ae1de91246226ae2d92aa6f2b2b43f55ecd20107884a551e08108a154d6910a784dcc0c4f574a6372180fa7
-  data.tar.gz: 891e30a62e1ffd96ca5c5f5c51bd8bee9b44653170e16930f0b91690be882c5603e56a9cfd7fbaa566a72e74754364d74aa3f90a64c05181fad6a1dd04bc75b0
+  metadata.gz: 8c8725d03ede411d1730f6ecd46aa916b2b7c1d04a6a7f74bca7bb868ce0c2225d300308aebbaab571ea7bf04a5267ed5dd1981d4e141dd4db065ecb03db8e56
+  data.tar.gz: e127fcd3aa1fcfdcd90f889416f10e817082df8b7584e51e1bc4a142428608e64a04e54cf6e6a16f4241a4957d56b07fed79e450c842750e3464e36407057b25

data/CHANGES.md

@@ -0,0 +1,20 @@
+# Changes
+
+## 2.0.2
+
+* Guard against assumption of MARC data when indexing using SolrJsonWriter ([#94](https://github.com/traject-project/traject/issues/94))
+* For MARC Records, try to use the production date when available ([#93](https://github.com/traject-project/traject/issues/93))
+
+## 2.0.1
+
+* Fix bad constant in logging ([#91](https://github.com/traject-project/traject/issues/91))
+
+## 2.0.0
+
+* Compatible with MRI/RBX
+* Default to SolrJsonWriter
+* Release separate MRI/JRuby gems
+
+## 1.0
+
+* First release

data/lib/traject/macros/marc21_semantics.rb

@@ -343,7 +343,7 @@ module Traject::Macros
         # the FIRST date then, the earliest. That's just what we're doing.
         if found_date.nil? && date_type != 'n' && date_type != 'q'
           # in date_type 'r', second date is original publication date, use that I think?
-          date_str = (date_type == 'r' && date2_str.to_i != 0) ? date2_str : date1_str
+          date_str = ((date_type == 'r' || date_type == 'p') && date2_str.to_i != 0) ? date2_str : date1_str
           # Deal with stupid 'u's, which end up meaning a range too,
           # find midpoint and make sure our tolerance is okay.
           ucount = 0

data/lib/traject/solr_json_writer.rb

@@ -167,9 +167,13 @@ class Traject::SolrJsonWriter
   end
 
   # Returns MARC 001, then a slash, then output_hash["id"] -- if both
-  # are present. Otherwise may return just one, or even an empty string. 
+  # are present. Otherwise may return just one, or even an empty string.
   def record_id_from_context(context)
-    marc_id = context.source_record && context.source_record['001'] && context.source_record['001'].value
+    marc_id = if context.source_record &&
+                 context.source_record.kind_of?(MARC::Record) &&
+                 context.source_record['001']
+      context.source_record['001'].value
+    end
     output_id = context.output_hash["id"]
 
     return [marc_id, output_id].compact.join("/")

data/lib/traject/version.rb

@@ -1,3 +1,3 @@
 module Traject
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traject
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: java
 authors:
 - Jonathan Rochkind
@@ -201,6 +201,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md