Commit Graph

93 Commits

Author SHA1 Message Date
Elliot Sawyer 2246fa9ab8 Obtain search results for a particular subsite when the request comes from a query (#136)
* Allow a user to obtain search results for a particular subsite when the request comes from a query

When attempting to do this in project code, SearchVariantSubsites kicks in and replaces any filter you've applied with the current subsite ID, which prevents you from searching for filtered results in another subsite.

This fix prevents the module from doing this if a filter is applied on the query

TODO  write unit tests for the filter() and exclude() behaviours
2017-03-30 11:17:46 +01:00
Daniel Hensby 9e5d432aa5
Merge branch 'pull/138' into 2.3 2017-03-09 10:47:21 +00:00
Damian Mooyman bbaf4276af
BUG Fix delete / unpublish
Split SearchUpdater classes into separate files
Fixes #134
2017-03-09 12:34:20 +13:00
Daniel Hensby 50c9f52d58
Test coverage for SearchVariantSubsites@extractManipulationWriteState 2016-12-09 12:02:10 +00:00
UndefinedOffset 6ff50fede9 BUGFIX: SolrVersionedTest_Index causing crash in unit tests when Phockito is not installed 2016-06-16 11:50:21 -03:00
Damian Mooyman e5fbdf9d42 BUG fix issues with search variants applying to more than one class 2016-04-26 12:43:31 +12:00
Damian Mooyman ec5e4f4581 BUG Fix versioned writes where subtables have no fields key
BUG Remove unnecessary config nesting in tests which are now handled via core
Fixes some regressions in recent framework fixes to versioned
2016-04-15 15:46:19 +12:00
helpfulrobot f87690ef22 Converted to PSR-2 2015-12-18 07:16:09 +13:00
madmatt 665490dfde MINOR: Don't include Hamcrest globally so it doesn't conflict with PHPUnit
PHPUnit now includes matching functions like `any()` and `anything()` outside of a namespace, which conflicts with `Phockito` that does the same thing when calling `Phockito::include_hamcrest(true)`.

This test in particular breaks Behat, because the file includes a class (`SolrReindexTest_Item`) that extends `DataObject`, meaning that this file gets included very early in the initialisation process.

Instead, we can just set `Phockito::include_hamcrest(false)` and use the full path to the Hamcrest matching functions instead (e.g. `\Hamcrest_Matchers::anything()`).
2015-11-27 12:43:33 +13:00
helpfulrobot 314feddd48 Converted to PSR-2 2015-11-21 19:19:20 +13:00
Damian Mooyman 1683f776bd API QueuedJob support for Solr_Reindex
API Incremental clear and re-index of records rather than clearing all records from SolrIndex up front
2015-07-28 12:46:23 +12:00
Damian Mooyman ae2828ed70 BUG Prevent subsites breaking solrindexversionedtest 2015-06-30 17:36:46 +12:00
Damian Mooyman f2f16ae863 API Enable boosted fields to be specified on the index
API Enable configuration of default field
2015-06-30 15:13:49 +12:00
Damian Mooyman 1608d8384d Merge pull request #63 from chillu/pulls/fix-highlight-support
Fix highlight support when querying by fields (or boosting fields)
2015-06-03 10:11:31 +12:00
Damian Mooyman 16a6f362e2 API Only allow one scheduled commit job at a time 2015-05-11 16:35:43 +12:00
Damian Mooyman 60b05db1ce API Separate searchupdate / commit into separate queued-jobs
API Enable indexes to deprecate other classes
API Enable indexes to be globally specified in config
2015-05-08 15:22:46 +12:00
Ingo Schommer 50f53e7bac Fix highlight support when querying by fields (or boosting fields)
Highlighting will simply be empty otherwise, presumably
because it can't match against the complex query term in the "q" parameter.
2015-05-05 19:44:07 +12:00
Damian Mooyman 620d7861b6 BUG Add missing addStoredFields method 2015-02-17 10:17:58 +13:00
☃ Stephen Shkardoon ☃ cb1770864d Merge pull request #49 from tractorcow/pulls/solr-4-compat
BUG Fix Solr 4.0 compatibility issue
2014-11-17 16:50:12 +13:00
Sean Harvey 2ba90f4239 Merge pull request #50 from tractorcow/pulls/phockito-failover
BUG Fix test case not elegantly failing on missing phockito
2014-08-21 17:22:23 +12:00
Sean Harvey e22d6053e5 Adding tests for SearchIndex::fieldData() 2014-08-21 16:58:59 +12:00
Damian Mooyman 9efe4baa16 API SearchUpdateQueuedJobProcessor now uses batching 2014-08-21 16:19:51 +12:00
Damian Mooyman 790afb211a BUG Fix test case not elegantly failing on missing phockito 2014-06-18 11:04:18 +12:00
Damian Mooyman 892562c2ba BUG Fix Solr 4.0 compatibility issue 2014-06-17 17:56:46 +12:00
Damian Mooyman 23a1ba6e1a BUG Fix subsite document ID generation 2014-05-22 16:48:37 +12:00
Darren Inwood a2cfbb531b BUG Fix sold indexing storing against the incorrect class key 2014-05-22 12:18:38 +12:00
Sam Minnee 4b51393e01 Don't rely on MySQL ordering of index->getAdded()
MySQL is more reliable in its output ordering of elements where the order doesn't matter.
PostgreSQL is not.  This meant that this test "accidentally passed" on MySQL and failed on
PostgreSQL.  The sort function resolves this.
2014-02-14 11:32:24 +13:00
Hamish Friedlander 3d18903552 API Add support for Solr 4 and make it the default
Solr::configure_server now takes "version" as one of the keys in the
option array, and behaves slightly differently depending on whether
that version is 3 or 4, to provide support for both Solr versions.

The Solr extras and templates have also moved, so that different
versions can be provided for the two different Solr versions.
2013-11-08 15:03:47 +13:00
Hamish Friedlander 03a206109a Make tests run 2013-09-11 14:35:01 +12:00
Hamish Friedlander dbd68dc300 API Move SearchUpdate queue handling to DIed processor, add QueuedJob support 2013-07-25 14:28:10 +12:00
Hamish Friedlander d6cf16c391 FIX Phockito-based tests to pass 2013-07-25 13:27:15 +12:00
Sean Harvey 3508aadf56 Merge branch 'pull/field-defs-analyzers' of github.com:silverstripe-big-o/silverstripe-fulltextsearch into silverstripe-big-o-pull/field-defs-analyzers 2013-02-13 10:40:08 +13:00
Hamish Friedlander 9ce4545bb9 Merge pull request #6 from silverstripe-big-o/ignore-empty-fields
Ignore empty fields
2012-11-01 14:27:31 -07:00
Hamish Friedlander e98b9e229f Merge pull request #5 from silverstripe-big-o/excludevariantstate
NEW SearchIndex->excludeVariantState()
2012-11-01 14:23:59 -07:00
Ingo Schommer 874bd32300 ENHANCEMENT Solr->addCopyFields() 2012-10-05 15:16:15 +02:00
Ingo Schommer 0ef78f905c ENHANCEMENT Per-field analyser support for SolrIndex 2012-10-05 12:40:46 +02:00
Ingo Schommer b6fd7b7b89 ENHANCEMENT Extra field definition options for SolrIndex 2012-10-05 12:40:43 +02:00
Ingo Schommer 2c7d6d0ab8 BUG Only index date fields with values
Otherwise the values end up being the start of epoch (1970-01-01)
by default, which can throw off search filters. See README additions for details.
2012-08-29 21:00:40 +02:00
Ingo Schommer 50304e4b0c NEW SearchIndex->excludeVariantState() 2012-08-28 23:34:51 +02:00
Ingo Schommer 989cc36766 NEW Added search-time boost support to SolrIndex 2012-08-23 18:30:46 +02:00
Hamish Friedlander 4766794cea BUG Tests need to call bind_manipulation_capture manually 2012-07-19 17:08:07 +12:00
Hamish Friedlander ce03eba8b8 Skip tests if dependancies missing 2012-07-19 13:41:05 +12:00
Hamish Friedlander 17be5a3e63 Import first version of fulltextsearch module 2011-05-02 16:33:05 +12:00