-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
🐛 I91 fix importer issues #93
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9549183
🐛 replace deprecated method and strip out nils
ShanaLMoore 6958dfd
:broom: remove bulkrax_metadata.yml and update mapping
ShanaLMoore 0430218
Merge branch 'main' into i91-fix-importer
ShanaLMoore b0a900b
💄rubocop fixes
ShanaLMoore 79a44cc
🧹 Updates submodule for bulkrax and iiif_print bug fixes
ShanaLMoore File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -78,10 +78,10 @@ def base64?(value) | |
def account_json_string | ||
return @account_json_string if @account_json_string | ||
@account_json_string = if @config['account_json'] | ||
base64?(@config['account_json']) ? Base64.decode64(@config['account_json']) : @config['account_json'] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. rubocop fixes |
||
else | ||
File.read(@config['account_json_path']) | ||
end | ||
base64?(@config['account_json']) ? Base64.decode64(@config['account_json']) : @config['account_json'] | ||
else | ||
File.read(@config['account_json_path']) | ||
end | ||
end | ||
|
||
def account_info | ||
|
@@ -176,31 +176,31 @@ def unique_visitors_for_id(id, date = default_date_range); end | |
|
||
def new_visitors(period = 'month', date = default_date_range) | ||
start_date, end_date = date_period(period, date) | ||
Visits.new(start_date: start_date, end_date: end_date).new_visits | ||
Visits.new(start_date:, end_date:).new_visits | ||
end | ||
|
||
def new_visits_by_day(date = default_date_range, period = 'range') | ||
start_date, end_date = date_period(period, date) | ||
VisitsDaily.new(start_date: start_date, end_date: end_date).new_visits | ||
VisitsDaily.new(start_date:, end_date:).new_visits | ||
end | ||
|
||
def returning_visitors(period = 'month', date = default_date_range) | ||
start_date, end_date = date_period(period, date) | ||
Visits.new(start_date: start_date, end_date: end_date).return_visits | ||
Visits.new(start_date:, end_date:).return_visits | ||
end | ||
|
||
def returning_visits_by_day(date = default_date_range, period = 'range') | ||
start_date, end_date = date_period(period, date) | ||
VisitsDaily.new(start_date: start_date, end_date: end_date).return_visits | ||
VisitsDaily.new(start_date:, end_date:).return_visits | ||
end | ||
|
||
def total_visitors(period = 'month', date = default_date_range) | ||
start_date, end_date = date_period(period, date) | ||
Visits.new(start_date: start_date, end_date: end_date).total_visits | ||
Visits.new(start_date:, end_date:).total_visits | ||
end | ||
|
||
def page_statistics(start_date, object) | ||
visits = VisitsDaily.new(start_date: start_date, end_date: Date.yesterday) | ||
visits = VisitsDaily.new(start_date:, end_date: Date.yesterday) | ||
visits.add_filter(dimension: 'contentId', values: [object.id.to_s]) | ||
visits.total_visits | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. updates bulkrax |
Submodule hyrax-webapp
updated
11 files
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this method was deprecated in Bulkrax v6.0.0. Because of this, the imports would fail silently if there's an issue.