Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ruby, elasticsearch upgrades, and documentation #211

Merged
merged 13 commits into from
Mar 23, 2023
Merged

Ruby, elasticsearch upgrades, and documentation #211

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
602f6be
upgrade to Ruby 3.0.4
wkdewey Oct 27, 2022
c6e687d
make keyword arguments compatible with Ruby 3
wkdewey Oct 27, 2022
dbe6aaa
go up to ruby 3.1.2
wkdewey Oct 27, 2022
6b1e468
add output if nested field is invalid
wkdewey Nov 8, 2022
de02891
don't use array method on person to avoid errors
wkdewey Nov 8, 2022
ba60f4c
update changelog for new version
wkdewey Nov 9, 2022
0ddcc33
update reference to ruby version
wkdewey Nov 9, 2022
a614c6d
make changes related to ES and API upgrade
wkdewey Nov 10, 2022
fbc0897
add links to more detailed documentation
wkdewey Nov 10, 2022
3cf2237
add link to elasticsearch documentation
wkdewey Nov 10, 2022
3cadd26
add conditional to creator for nil checking
wkdewey Nov 18, 2022
3498ebe
Create schema_v2.md
karindalziel Nov 10, 2022
5b0f54f
make sure webs_to_es fields can handle nil values
wkdewey Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lib/datura/to_es/webs_to_es/fields.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ def data_type
end

def date(before=true)
datestr = get_list(@xpaths["date"]).first
if get_list(@xpaths["date"])
datestr = get_list(@xpaths["date"]).first
else
datestr = nil
end
Comment on lines +42 to +46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd write this more briefly with a ternary, but no need to change it:

datestr = get_list(@xpaths["date"]) ? get_list(@xpaths["date"]).first : nil

if datestr
Datura::Helpers.date_standardize(datestr, true)
end
Expand Down Expand Up @@ -80,7 +84,9 @@ def format
end

def image_id
get_list(@xpaths["image_id"]).first
if get_list(@xpaths["image_id"])
get_list(@xpaths["image_id"]).first
end
end

def keywords
Expand Down Expand Up @@ -218,7 +224,9 @@ def works
# new/moved fields for API 2.0

def cover_image
get_list(@xpaths["image_id"]).first
if get_list(@xpaths["image_id"])
get_list(@xpaths["image_id"]).first
end
end

def date_updated
Expand Down