Skip to content

Commit

Permalink
Feature: use the new SOLR Schema API instead of SOLR config files (#68)
Browse files Browse the repository at this point in the history
* update docker compose to use standard SOLR not the ontoportal configured

* update term search to use the new Schema API and remove config files

* update properties search to use the new Schema API & remove config files

* update class and properties schema to use the existent dynamic names
  • Loading branch information
syphax-bouazzouni authored Mar 6, 2024
1 parent 360370c commit cb9dfaf
Show file tree
Hide file tree
Showing 20 changed files with 43 additions and 5,627 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ruby-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up solr configsets
run: ./test/solr/generate_ncbo_configsets.sh
- name: Install Dependencies
run: sudo apt-get update && sudo apt-get -y install raptor2-utils
- name: Set up JDK 11
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ gem 'sinatra', '~> 1.0'
gem 'sinatra-advanced-routes'
gem 'sinatra-contrib', '~> 1.0'
gem 'request_store'
gem 'parallel'

# Rack middleware
gem 'ffi'
Expand Down
12 changes: 7 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/goo.git
revision: 1be1c83158177935cfc77230d42054de984e2d09
revision: 6c51346b6f150a69391794b7909b30592acbbe0e
branch: development
specs:
goo (0.0.2)
Expand Down Expand Up @@ -57,7 +57,7 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
revision: 18a45c2b8a4f8d6c9f56181b4f25b7e0b116a44c
revision: d37aeafbd7bef120917fb4d601f8287a9a859f69
branch: development
specs:
ontologies_linked_data (0.0.1)
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.5.1)
sshkit (>= 1.6.1, != 1.7.0)
backports (3.24.1)
backports (3.25.0)
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt_pbkdf (1.1.0)
Expand Down Expand Up @@ -233,7 +233,7 @@ GEM
json-schema (2.8.1)
addressable (>= 2.4)
json_pure (2.7.1)
jwt (2.8.0)
jwt (2.8.1)
base64
kgio (2.11.4)
libxml-ruby (5.0.2)
Expand All @@ -249,7 +249,7 @@ GEM
method_source (1.0.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0206)
mime-types-data (3.2024.0305)
mini_mime (1.1.5)
minitest (4.7.5)
minitest-stub_any_instance (1.0.3)
Expand Down Expand Up @@ -279,6 +279,7 @@ GEM
omni_logger (0.1.4)
logger
os (1.1.4)
parallel (1.24.0)
parseconfig (1.1.2)
pony (1.13.1)
mail (>= 2.0)
Expand Down Expand Up @@ -431,6 +432,7 @@ DEPENDENCIES
newrelic_rpm
oj (~> 2.0)
ontologies_linked_data!
parallel
parseconfig
pry
rack
Expand Down
4 changes: 2 additions & 2 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
GOO_HOST = ENV.include?("GOO_HOST") ? ENV["GOO_HOST"] : "localhost"
REDIS_HOST = ENV.include?("REDIS_HOST") ? ENV["REDIS_HOST"] : "localhost"
REDIS_PORT = ENV.include?("REDIS_PORT") ? ENV["REDIS_PORT"] : 6379
SOLR_TERM_SEARCH_URL = ENV.include?("SOLR_TERM_SEARCH_URL") ? ENV["SOLR_TERM_SEARCH_URL"] : "http://localhost:8983/solr/term_search_core1"
SOLR_PROP_SEARCH_URL = ENV.include?("SOLR_PROP_SEARCH_URL") ? ENV["SOLR_PROP_SEARCH_URL"] : "http://localhost:8984/solr/prop_search_core1"
SOLR_TERM_SEARCH_URL = ENV.include?("SOLR_TERM_SEARCH_URL") ? ENV["SOLR_TERM_SEARCH_URL"] : "http://localhost:8983/solr"
SOLR_PROP_SEARCH_URL = ENV.include?("SOLR_PROP_SEARCH_URL") ? ENV["SOLR_PROP_SEARCH_URL"] : "http://localhost:8983/solr"
MGREP_HOST = ENV.include?("MGREP_HOST") ? ENV["MGREP_HOST"] : "localhost"
MGREP_PORT = ENV.include?("MGREP_PORT") ? ENV["MGREP_PORT"] : 55556
GOO_SLICES = ENV["GOO_SLICES"] || 500
Expand Down
12 changes: 0 additions & 12 deletions config/solr/property_search/enumsconfig.xml

This file was deleted.

246 changes: 0 additions & 246 deletions config/solr/property_search/mapping-ISOLatin1Accent.txt

This file was deleted.

Loading

0 comments on commit cb9dfaf

Please sign in to comment.