Merge branch 'development' into stage

ontoportal-lirmm · Jan 12, 2024 · a8aaedf · a8aaedf
2 parents c0da72b + 2cabca4
commit a8aaedf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,8 +11,8 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/goo.git
-  revision: 6187c205a1310c2f8a72fe8e07fcf99477060fa9
-  branch: development
+  revision: 03da25b671d2ffa515b5dce51c6bd35980ae60c7
+  branch: master
   specs:
     goo (0.0.2)
       addressable (~> 2.8)
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/ncbo_cron.git
-  revision: 53ad701ab840ba43dbde0f13b7a883f234825183
+  revision: 155db7a33794f03858893d2367cb119f27726a31
   branch: master
   specs:
     ncbo_cron (0.0.1)
@@ -53,8 +53,8 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
-  revision: d5af89ba5563cbd9bfc06c51a8330015dd737614
-  branch: development
+  revision: e98b884999e5ce917a8be5fdc37f7b4797a1559e
+  branch: master
   specs:
     ontologies_linked_data (0.0.1)
       activesupport
@@ -220,7 +220,7 @@ GEM
     multipart-post (2.3.0)
     mutex_m (0.2.0)
     net-http-persistent (2.9.4)
-    net-imap (0.4.9)
+    net-imap (0.4.8)
       date
       net-protocol
     net-pop (0.1.2)
@@ -407,4 +407,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.15
+   2.3.23
diff --git a/controllers/analytics_controller.rb b/controllers/analytics_controller.rb
@@ -1,5 +1,6 @@
 require 'csv'
-class AnalyticsController < ApplicationController
+
+class OntologyAnalyticsController < ApplicationController
 
   ##
   # get all ontology analytics for a given year/month combination

diff --git a/test/controllers/test_ontology_analytics_controller.rb b/test/controllers/test_ontology_analytics_controller.rb
@@ -203,7 +203,9 @@ def self.before_suite
       puts "   This test cannot be run because there #{db_size} redis entries (max #{MAX_TEST_REDIS_SIZE}). You are probably pointing to the wrong redis backend. "
       return
     end
-    @@redis.set(LinkedData::Models::Ontology::ONTOLOGY_ANALYTICS_REDIS_FIELD, Marshal.dump(ANALYTICS_DATA))
+
+    stringy_keys = ANALYTICS_DATA.transform_values{|year| year.map{|k,v| [k.to_s , v.stringify_keys]}.to_h}
+    @@redis.set(LinkedData::Models::Ontology::ONTOLOGY_ANALYTICS_REDIS_FIELD, Marshal.dump(stringy_keys))
     @@onts = {
         "NCIT" => "NCIT Ontology",
         "ONTOMA" => "ONTOMA Ontology",

diff --git a/views/documentation/documentation.haml b/views/documentation/documentation.haml
@@ -151,6 +151,7 @@
               %li include={prefLabel, synonym, definition, notation, cui, semanticType} // default = (see Common Parameters section)
               %li page={integer representing the page number} // default = 1
               %li pagesize={integer representing the size of the returned page} // default = 50
+              %li language={an ISO 639-1 language value, e.g 'fr' or 'en'} // by default search in all languages
 
         %h4#nav_search_subtree Subtree Search