traject 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373bacd3f89f1c190ac11118b87f69a8bffdb1ad
-  data.tar.gz: 3db4b9acbf2ba3830c8c815d8977ad5d6b24f5bc
+  metadata.gz: f738d7b32e8ccc9ac89b1ed735a154790a36c656
+  data.tar.gz: 79d32ec442d5569b50ac4c8c2f25d588de335a79
 SHA512:
-  metadata.gz: 7fe42ac6c3cba77c20c6a752887be6f3820d8858654d80e6681069b5c3e62fb2367e6a8d6747b771abccce45ecc58aa62e475a46b97fd2586d12ac59475387b3
-  data.tar.gz: ee096fc51b36492e36a9f70cdfbc5844eeb60d844c45e237b46f3b55da2b09e72893d70c5091fc7b5c152c6f4296cd9c5977ce02845ce8422c3b4cec96908c47
+  metadata.gz: 3042d06bc09ffc3421a334595a6393a047e0425f0b41221ab17b6881de7e96e07040f51ea1f3b4a18dd24580158eebaa341c6e640cc31263385f497584b33f75
+  data.tar.gz: 811378d18249d07db3c85dc31205e2d70a98b86b6edd57fb97789f3aaa98c7b6fd7b1045966674c06eced1c6cc87848ef1efc361994f383a5c05488046fc286a

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: ruby
 authors:
 - Jonathan Rochkind
@@ -187,6 +187,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md