Add Dspace configuration file and initializer

app/controllers/search/solr_controller.rb

@@ -3,7 +3,7 @@ class Search::SolrController < ApplicationController
   def search
     queryParams = {:q => '*:*', :fq => params[:qry]}
 
-    results = solr_client.get 'select',
+    results = solr_client('search').get 'select',
       :params => merge_search_parameters(queryParams, solr_search_default_parameters)
 
     @numFound = results["response"]["numFound"]
@@ -26,8 +26,8 @@ class Search::SolrController < ApplicationController
     return resultList
   end
 
-  def solr_client
-    return RSolr.connect :url => Dspace::Config.solr_url
+  def solr_client(core)
+    return RSolr.connect :url => Dspace::Config.solr_url(:ssl => false, :port => 8080) + '/' + core
   end
 
   def merge_search_parameters(p1, p2)

config/dspace.yml

 development:
-  dspace_url: https://portalmecdev.c3sl.ufpr.br:8443
-  rest_webapp: /rest
-  solr_webapp: /solr
+  host: portalmecdev.c3sl.ufpr.br
+  port: 8443
+  rest_webapp_name: rest
+  solr_webapp_name: solr
 
 test:
-  dspace_url: https://portalmecdev.c3sl.ufpr.br:8443
-  rest_webapp: /rest
-  solr_webapp: /solr
+  host: portalmecdev.c3sl.ufpr.br
+  port: 8443
+  rest_webapp_name: rest
+  solr_webapp_name: solr
 
 production:
-  dspace_url: https://portalmecdev.c3sl.ufpr.br:8443
-  rest_webapp: /rest
-  solr_webapp: /solr
+  host: portalmecdev.c3sl.ufpr.br
+  port: 8443
+  rest_webapp_name: rest
+  solr_webapp_name: solr

config/initializers/dspace.rb

+require 'yaml'
+
+dspace_configs = YAML.load_file(Rails.root.join('config').to_s.concat('/dspace.yml'))
+env_config = dspace_configs.fetch(Rails.env)
+
+Dspace::Config.host = env_config['host']
+Dspace::Config.port = env_config['port']
+Dspace::Config.rest_webapp_name = env_config['rest_webapp_name']
+Dspace::Config.solr_webapp_name = env_config['solr_webapp_name']

lib/dspace/client.rb

+class OrientDb::Client
+end

lib/dspace/config.rb

+module Dspace::Config
+  @@ssl = true
+  @@port = 8443
+
+  def self.host=(host)
+    @@host = host
+  end
+
+  def self.port=(port)
+    @@port = port
+  end
+
+  def self.ssl=(ssl)
+    @@ssl = ssl
+  end
+
+  def self.rest_webapp_name=(rest_webapp_name)
+    @@rest_webapp_name = rest_webapp_name
+  end
+
+  def self.solr_webapp_name=(solr_webapp_name)
+    @@solr_webapp_name = solr_webapp_name
+  end
+
+  def self.host
+    @@host
+  end
+
+  def self.port
+    @@port || 8080
+  end
+
+  def self.ssl
+    @@ssl || false
+  end
+
+  def self.rest_webapp_name
+    @@rest_webapp_name || 'rest'
+  end
+
+  def self.solr_webapp_name
+    @@solr_webapp_name || 'solr'
+  end
+
+  def self.rest_url(*args)
+    options = args.extract_options!
+    unless options[:port].nil?
+      port = options[:port].to_s
+    else
+      port = self.port.to_s
+    end
+    if self.ssl == false || options[:ssl] == false
+      return 'http://' + self.host + ':' + port + '/' + self.rest_webapp_name
+    else
+      return 'https://' + self.host + ':' + port + '/' + self.rest_webapp_name
+    end
+  end
+
+  def self.solr_url(*args)
+    options = args.extract_options!
+    unless options[:port].nil?
+      port = options[:port].to_s
+    else
+      port = self.port.to_s
+    end
+    if self.ssl == false || options[:ssl] == false
+      return 'http://' + self.host + ':' + port + '/' + self.solr_webapp_name
+    else
+      return 'https://' + self.host + ':' + port + '/' + self.solr_webapp_name
+    end
+  end
+
+end