tonyair/silverstripe-fulltextsearch
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch synced 2024-10-22 12:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Change segments for configure and reindex tasks

Browse Source
This commit is contained in:
Marco Hermo 2017-04-29 01:30:29 +12:00
parent b4d1e45f3c
commit 2932ae94ca
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/solr/tasks/Solr_Configure.php
View File

@ -9,7 +9,7 @@ use SilverStripe\FullTextSearch\Solr\Stores\SolrConfigStore;
class Solr_Configure extends Solr_BuildTask class Solr_Configure extends Solr_BuildTask
{ {
private static $segment = 'Solr_Configure'; private static $segment = 'SilverStripeFullTextSearchSolrTasksSolr_Configure';
protected $enabled = true; protected $enabled = true;
public function run($request) public function run($request)
@ -80,8 +80,6 @@ class Solr_Configure extends Solr_BuildTask
return new SolrConfigStore_File($indexstore); return new SolrConfigStore_File($indexstore);
} elseif ($mode == 'webdav') { } elseif ($mode == 'webdav') {
return new SolrConfigStore_WebDAV($indexstore); return new SolrConfigStore_WebDAV($indexstore);
//@todo left commented after confusing merge conflict. Revisit if further testing is required
//} elseif (ClassInfo::exists($mode) && ClassInfo::classImplements($mode, 'SolrConfigStore')) {
} elseif (ClassInfo::exists($mode) && ClassInfo::classImplements($mode, SolrConfigStore::class)) { } elseif (ClassInfo::exists($mode) && ClassInfo::classImplements($mode, SolrConfigStore::class)) {
return new $mode($indexstore); return new $mode($indexstore);
} else { } else {

7
code/solr/tasks/Solr_Reindex.php
View File

@ -25,7 +25,7 @@ use SilverStripe\FullTextSearch\Solr\SolrIndex;
*/ */
class Solr_Reindex extends Solr_BuildTask class Solr_Reindex extends Solr_BuildTask
{ {
private static $segment = 'Solr_Reindex'; private static $segment = 'SilverStripeFullTextSearchSolrTasksSolr_Reindex';
protected $enabled = true; protected $enabled = true;
@ -44,11 +44,6 @@ class Solr_Reindex extends Solr_BuildTask
*/ */
protected function getHandler() protected function getHandler()
{ {
//@todo: this needs to determine the best class from a Factory implementation
//@todo: it was 'SolrReindexHandler' but that doesn't work on 4.0
//@todo left commented after a confusing merge conflict. Revisit if further investigation /testing is needed
//return Injector::inst()->get('SolrReindexImmediateHandler');
return Injector::inst()->get(SolrReindexHandler::class); return Injector::inst()->get(SolrReindexHandler::class);
} }