diff options
| -rw-r--r-- | config/.cvsignore | 2 | ||||
| -rw-r--r-- | config/environment.rb | 20 | ||||
| -rw-r--r-- | config/solr.yml-example | 13 | ||||
| -rw-r--r-- | todo.txt | 9 |
4 files changed, 3 insertions, 41 deletions
diff --git a/config/.cvsignore b/config/.cvsignore index 28a08240d..2539dd3cd 100644 --- a/config/.cvsignore +++ b/config/.cvsignore @@ -1,5 +1,3 @@ general database.yml rails_env.rb -solr.yml -solr.yml.deployed diff --git a/config/environment.rb b/config/environment.rb index 8de70344c..d05981b0d 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -129,26 +129,6 @@ module ActiveRecord end end -# Monkeypatch! Make it so :if really turns off all access to solr on saving. -module ActsAsSolr - module InstanceMethods - # saves to the Solr index - def solr_save - return true unless configuration[:if] - if evaluate_condition(configuration[:if], self) - logger.debug "solr_save: #{self.class.name} : #{record_id(self)}" - solr_add to_solr_doc - solr_commit if configuration[:auto_commit] - true - else - # XXX commented out - so when new requests arrive no connection is - # made to solr, in case it is broken. - # solr_destroy - end - end - end -end - # Monkeypatch! Hack for admin pages, when proxied via https on mySociety servers, they # need a relative URL. module WillPaginate diff --git a/config/solr.yml-example b/config/solr.yml-example deleted file mode 100644 index 00100439e..000000000 --- a/config/solr.yml-example +++ /dev/null @@ -1,13 +0,0 @@ -# Config file for the acts_as_solr plugin. -# -# XXX This is hackily read by vendor/plugins/acts_as_solr/config/environment.rb -# for the rake task to start things with the right port. - -development: - url: http://localhost:8999/solr - -test: - url: http://localhost:8991/solr - -production: - url: http://localhost:8983/solr @@ -9,20 +9,17 @@ deployment: change the exec_after scripts to not do solr rebuild the xapian index install it on the server - -solr_object -grep for solr and Solr in app -bin/rails-post-deploy -http://localhost:3000/list - sent highlighted here + make sure solr is stopped check that you aren't doing collapse_by for RSS / Email - date range tips in search help check emails look OK remove all the scripts in scripts/*solr* remove all the solr plugins and stuff +http://localhost:3000/list - sent highlighted here + You need to reload db after deleting stuff, how do we deal with that? highlight word docs text |