Merge pull request #161 from ncbo/develop

Develop -> Master merge, Release v5.33.1
ncbo · Oct 22, 2024 · 3c3ab5a · 3c3ab5a
2 parents f943ac3 + d4da86d
commit 3c3ab5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/lib/goo.rb b/lib/goo.rb
@@ -265,6 +265,10 @@ def self.sparql_backend_name(name=:main)
     return @@sparql_backends[name][:backend_name]
   end
 
+  def self.portal_language
+    @@main_languages.first.downcase.to_sym
+  end
+
   def self.id_prefix
     return @@id_prefix
   end

diff --git a/lib/goo/search/search.rb b/lib/goo/search/search.rb
@@ -65,14 +65,6 @@ def search(q, params={}, connection_name=:main)
       def indexBatch(collection, connection_name=:main)
         docs = Array.new
         collection.each do |c|
-
-
-
-          # c.bring(:prefLabel)
-          # binding.pry if c.prefLabel == "biodiversity"
-
-
-
           docs << c.indexable_object
         end
         Goo.search_connection(connection_name).add(docs)

diff --git a/lib/goo/sparql/mixins/solution_lang_filter.rb b/lib/goo/sparql/mixins/solution_lang_filter.rb
@@ -171,17 +171,13 @@ def show_all_languages?
         end
 
         def get_language(languages)
-          languages = portal_language if languages.nil? || languages.empty?
+          languages = Goo.portal_language if languages.nil? || languages.empty?
           lang = languages
           lang = languages.to_s.split(',') unless lang.is_a?(Array)
           lang = lang.map { |l| l.upcase.to_sym }
           lang.length == 1 ? lang.first : lang
         end
 
-        def portal_language
-          Goo.main_languages.first
-        end
-
       end
     end
   end