relaton-iso 2.0.0.pre.alpha.4 → 2.0.0.pre.alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/relaton/iso/bibliography.rb +15 -5
- data/lib/relaton/iso/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: da51a73ec48407d3ef4d282539f1484cd967fcf49c1903e5af5d68f85d8efeed
|
|
4
|
+
data.tar.gz: f50534492470af38a24a7c0f0e9478d447050f36b21b0850687b48716092329b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e21a0a4e2522b0bd8264ad4e6b883518c0d43536c392be0e5f113ad00bc53dc6b2e360962008ee56bc0e528864b41ff1e9a5cbbcb9c676f3c48d7df4a7f81c7e
|
|
7
|
+
data.tar.gz: 327762296156cfd01cd994f66160989e39e1d89d5d1d2137f72812815b07f575b9753b82e103e75da4408bc4058779b362e726001d664c7e11434d3e7c20b01d
|
|
@@ -60,7 +60,7 @@ module Relaton
|
|
|
60
60
|
get_all = (query_pubid.root.year && opts[:keep_year].nil?) || opts[:keep_year] || opts[:all_parts] ||
|
|
61
61
|
opts[:publication_date_before] || opts[:publication_date_after]
|
|
62
62
|
if get_all
|
|
63
|
-
|
|
63
|
+
filter_item_by_date(ret, opts) if date_filter
|
|
64
64
|
return ret
|
|
65
65
|
end
|
|
66
66
|
|
|
@@ -121,13 +121,23 @@ module Relaton
|
|
|
121
121
|
|
|
122
122
|
private
|
|
123
123
|
|
|
124
|
-
# Filter out relations
|
|
124
|
+
# Filter out relations and dates that fall outside the date range.
|
|
125
125
|
# @param item [Relaton::Iso::ItemData]
|
|
126
126
|
# @param opts [Hash]
|
|
127
|
-
def
|
|
128
|
-
|
|
127
|
+
def filter_item_by_date(item, opts)
|
|
128
|
+
if item.relation&.any?
|
|
129
|
+
item.relation.reject! { |rel| relation_outside_date_range?(rel, opts) }
|
|
130
|
+
end
|
|
131
|
+
|
|
132
|
+
# Filter dates that occurred after the cut-off (keep published date always)
|
|
133
|
+
if item.date&.any? && opts[:publication_date_before]
|
|
134
|
+
item.date.reject! do |d|
|
|
135
|
+
next false if d.type == "published"
|
|
129
136
|
|
|
130
|
-
|
|
137
|
+
date_val = d.at&.to_date || d.from&.to_date
|
|
138
|
+
date_val && date_val >= opts[:publication_date_before]
|
|
139
|
+
end
|
|
140
|
+
end
|
|
131
141
|
end
|
|
132
142
|
|
|
133
143
|
# Check if a relation's bibitem date falls outside the given date range.
|
data/lib/relaton/iso/version.rb
CHANGED