Fix: Federated search/browse results count by portal
#870
Conversation
Bilelkihal
changed the title
Federated search/browse results count by portal
app/helpers/federation_helper.rb
Outdated
| @@ -234,7 +238,7 @@ def counts_ontology_ids_by_portal_name(portals_ids) | |||
| counts[current_portal.downcase] += 1 if id.include?(current_portal.to_s.downcase) | |||
|
|
|||
| federation_portals.each do |portal| | |||
| portal_api = federated_portals[portal.downcase.to_sym][:api] | |||
| portal_api = federated_portals[portal.downcase.to_sym][:name].downcase | |||
There was a problem hiding this comment.
Using a portal's name does not always work. Sometimes, the API URL is not the same as the portal name.
And what did you need to change this line?
There was a problem hiding this comment.
In the search page, to count the results that are in the :other_portals list, we don't have the api url, but instead we have the ui url.
Ok no big deal, to solve this I will just check both like this:
counts[portal.downcase] += 1 if (id.include?(portal_api) || id.include?(portal_ui))
| @@ -234,8 +238,9 @@ def counts_ontology_ids_by_portal_name(portals_ids) | |||
| counts[current_portal.downcase] += 1 if id.include?(current_portal.to_s.downcase) | |||
|
|
|||
| federation_portals.each do |portal| | |||
| portal_api = federated_portals[portal.downcase.to_sym][:api] | |||
| counts[portal.downcase] += 1 if id.include?(portal_api) | |||
| portal_api = federated_portals[portal.downcase.to_sym][:api].sub(/^https?:\/\//, '') | |||
There was a problem hiding this comment.
@syphax-bouazzouni I added sub(/^https?:\/\//, '') here to make sure to deal with http, https variations.
cause I found for example the ontology STY in earthportal is using http "http://earthportal.eu/ontologies/STY" while the UI link is using https "https://ecoportal.lifewatch.eu/"
There was a problem hiding this comment.
Yeah, sometimes you can even get, an IP, not the actual domain name. but anyway for now good enough.
| @@ -234,8 +238,9 @@ def counts_ontology_ids_by_portal_name(portals_ids) | |||
| counts[current_portal.downcase] += 1 if id.include?(current_portal.to_s.downcase) | |||
|
|
|||
| federation_portals.each do |portal| | |||
| portal_api = federated_portals[portal.downcase.to_sym][:api] | |||
| counts[portal.downcase] += 1 if id.include?(portal_api) | |||
| portal_api = federated_portals[portal.downcase.to_sym][:api].sub(/^https?:\/\//, '') | |||
There was a problem hiding this comment.
Yeah, sometimes you can even get, an IP, not the actual domain name. but anyway for now good enough.
Related issue: #859
Changes
(9f0fee8) (5f460ff)
Screenshots:
Federated browse
Federated search
