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

Merge pull request #60 from ss23/fix_solr_4

Browse Source 
Fix compatibility with solr 4
This commit is contained in:
Sean Harvey 2014-11-25 12:15:17 +13:00
commit 2d3467359f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/solr/SolrService.php
View File

@ -47,9 +47,19 @@ class SolrService extends Apache_Solr_Service {
public function serviceForCore($core) { public function serviceForCore($core) {
if (!isset($this->_serviceCache[$core])) { if (!isset($this->_serviceCache[$core])) {
$this->_serviceCache[$core] = new Apache_Solr_Service($this->_host, $this->_port, $this->_path."$core", $this->_httpTransport); $this->_serviceCache[$core] = new self($this->_host, $this->_port, $this->_path."$core", $this->_httpTransport);
} }
return $this->_serviceCache[$core]; return $this->_serviceCache[$core];
} }
/**
* A version of commit() that won't send the waitFlush parameter, which is useless and removed in SOLR 4
*/
public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600) {
$expungeValue = $expungeDeletes ? 'true' : 'false';
$searcherValue = $waitSearcher ? 'true' : 'false';
$rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitSearcher="' . $searcherValue . '" />';
return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
}
} }