prfioritize API filtring over the index in the browse page

ontoportal-lirmm · Apr 10, 2024 · 5d2c2f0 · 5d2c2f0
1 parent 53cc4b4
commit 5d2c2f0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/app/controllers/concerns/submission_filter.rb b/app/controllers/concerns/submission_filter.rb
@@ -1,6 +1,8 @@
 module SubmissionFilter
   extend ActiveSupport::Concern
 
+  include SearchContent
+
   BROWSE_ATTRIBUTES = ['ontology', 'submissionStatus', 'description', 'pullLocation', 'creationDate',
                        'contact', 'released', 'naturalLanguage', 'hasOntologyLanguage',
                        'hasFormalityLevel', 'isOfType', 'deprecated', 'status', 'metrics']
@@ -41,12 +43,10 @@ def submissions_paginate_filter(params)
                formats: request_params[:hasOntologyLanguage] }
     submissions = []
 
-    @time = Benchmark.realtime do
-      if search_backend.eql?('api') || search_backend.eql?('0')
-        submissions = filter_using_data(**params)
-      else
-        submissions = filter_using_index(**params)
-      end
+    if search_backend.eql?('index')
+      submissions = filter_using_index(**params)
+    else
+      submissions = filter_using_data(**params)
     end
 
     submissions = submissions.reject { |sub| sub.ontology.nil? }.map { |sub| ontology_hash(sub, @ontologies) }
@@ -69,7 +69,7 @@ def ontologies_filter_url(filters, page: 1, count: false)
   private
 
   def filter_using_index(query:, status:, show_views:, private_only:, languages:, page_size:, formality_level:, is_of_type:, groups:, categories:, formats:)
-    helpers.search_ontologies(
+    search_ontologies(
       query: query,
       status: status,
       show_views: show_views,

diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb
@@ -32,14 +32,17 @@ class OntologiesController < ApplicationController
   def index
     @categories = LinkedData::Client::Models::Category.all(display_links: false, display_context: false)
     @groups = LinkedData::Client::Models::Group.all(display_links: false, display_context: false)
-    
+
     @filters = ontology_filters_init(@categories, @groups)
     init_filters(params)
     render 'ontologies/browser/browse'
   end
 
   def ontologies_filter
-    @ontologies, @count, @count_objects, @request_params = submissions_paginate_filter(params)
+    @time = Benchmark.realtime do
+      @ontologies, @count, @count_objects, @request_params = submissions_paginate_filter(params)
+    end
+
     if @page.page.eql?(1)
       streams = [prepend("ontologies_list_view-page-#{@page.page}", partial: 'ontologies/browser/ontologies')]
       streams += @count_objects.map do |section, values_count|
@@ -207,8 +210,8 @@ def sparql
 
   def content_serializer
     @result = serialize_content(ontology_acronym: params[:acronym],
-                      concept_id: params[:id],
-                      format: params[:output_format])
+                                concept_id: params[:id],
+                                format: params[:output_format])
 
     render 'ontologies/content_serializer', layout: nil
   end