mirror of
https://github.com/silverstripe/silverstripe-fulltextsearch
synced 2024-10-22 14:05:29 +02:00
Merge branch '3.5' into 3.6
This commit is contained in:
commit
2fbb6d2787
0
bin/fulltextsearch_quickstart
Normal file → Executable file
0
bin/fulltextsearch_quickstart
Normal file → Executable file
@ -2,10 +2,8 @@
|
||||
|
||||
namespace SilverStripe\FullTextSearch\Solr\Services;
|
||||
|
||||
use Apache_Solr_Response;
|
||||
use SilverStripe\Core\Config\Config;
|
||||
use SilverStripe\FullTextSearch\Solr\Solr;
|
||||
use SilverStripe\FullTextSearch\Solr\SolrIndex;
|
||||
use Silverstripe\Core\ClassInfo;
|
||||
|
||||
/**
|
||||
* The API for accessing the primary Solr installation, which includes both SolrService_Core,
|
||||
@ -18,18 +16,24 @@ class SolrService extends SolrService_Core
|
||||
|
||||
/**
|
||||
* Handle encoding the GET parameters and making the HTTP call to execute a core command
|
||||
*
|
||||
* @param string $command
|
||||
* @param string $core
|
||||
* @param array $params
|
||||
* @return Apache_Solr_Response
|
||||
*/
|
||||
protected function coreCommand($command, $core, $params = array())
|
||||
{
|
||||
$command = strtoupper($command);
|
||||
$params = array_merge($params, array('action' => $command, 'wt' => 'json'));
|
||||
$params[$command == 'CREATE' ? 'name' : 'core'] = $core;
|
||||
$params[$command === 'CREATE' ? 'name' : 'core'] = $core;
|
||||
|
||||
return $this->_sendRawGet($this->_constructUrl('admin/cores', $params));
|
||||
}
|
||||
|
||||
/**
|
||||
* Is the passed core active?
|
||||
*
|
||||
* @param string $core The name of the core (an encoded class name)
|
||||
* @return boolean True if that core exists & is active
|
||||
*/
|
||||
@ -42,11 +46,12 @@ class SolrService extends SolrService_Core
|
||||
|
||||
/**
|
||||
* Create a new core
|
||||
* @param $core string - The name of the core
|
||||
* @param $instancedir string - The base path of the core on the server
|
||||
* @param $config string - The filename of solrconfig.xml on the server. Default is $instancedir/solrconfig.xml
|
||||
* @param $schema string - The filename of schema.xml on the server. Default is $instancedir/schema.xml
|
||||
* @param $datadir string - The path to store data for this core on the server. Default depends on solrconfig.xml
|
||||
*
|
||||
* @param string $core The name of the core
|
||||
* @param string $instancedir The base path of the core on the server
|
||||
* @param string $config The filename of solrconfig.xml on the server. Default is $instancedir/solrconfig.xml
|
||||
* @param string $schema The filename of schema.xml on the server. Default is $instancedir/schema.xml
|
||||
* @param string $datadir The path to store data for this core on the server. Default depends on solrconfig.xml
|
||||
* @return Apache_Solr_Response
|
||||
*/
|
||||
public function coreCreate($core, $instancedir, $config = null, $schema = null, $datadir = null)
|
||||
@ -67,7 +72,8 @@ class SolrService extends SolrService_Core
|
||||
|
||||
/**
|
||||
* Reload a core
|
||||
* @param $core string - The name of the core
|
||||
*
|
||||
* @param string $core The name of the core
|
||||
* @return Apache_Solr_Response
|
||||
*/
|
||||
public function coreReload($core)
|
||||
@ -77,7 +83,8 @@ class SolrService extends SolrService_Core
|
||||
|
||||
/**
|
||||
* Create a new Solr4Service_Core instance for the passed core
|
||||
* @param $core string - The name of the core
|
||||
*
|
||||
* @param string $core The name of the core
|
||||
* @return Solr4Service_Core
|
||||
*/
|
||||
public function serviceForCore($core)
|
||||
|
Loading…
Reference in New Issue
Block a user