tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP more SS4 compatibility fixes

This commit is contained in:
elliot sawyer 2017-04-21 11:37:01 +12:00
parent 45473db303
commit 19b38e0811
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/search/SearchIndex.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace FulltextSearch;
use SilverStripe\View\ViewableData; use SilverStripe\View\ViewableData;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;

1
code/search/SearchQuery.php
View File

@ -5,6 +5,7 @@
* *
* API very much still in flux. * API very much still in flux.
*/ */
use SilverStripe\View\ViewableData;
class SearchQuery extends ViewableData class SearchQuery extends ViewableData
{ {
public static $missing = null; public static $missing = null;

13
code/search/SearchUpdater.php
View File

@ -12,6 +12,14 @@
* *
* TODO: The way we bind in is awful hacky. * TODO: The way we bind in is awful hacky.
*/ */
use SilverStripe\Core\Object;
use SilverStripe\Control\RequestFilter;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session;
use SilverStripe\ORM\DataModel;
use SilverStripe\Control\HTTPResponse;
use SilverStripe\ORM\DataExtension;
class SearchUpdater extends Object class SearchUpdater extends Object
{ {
/** /**
@ -206,12 +214,13 @@ class SearchUpdater extends Object
class SearchUpdater_BindManipulationCaptureFilter implements RequestFilter class SearchUpdater_BindManipulationCaptureFilter implements RequestFilter
{ {
public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model)
public function preRequest(HTTPRequest $request, Session $session, DataModel $model)
{ {
SearchUpdater::bind_manipulation_capture(); SearchUpdater::bind_manipulation_capture();
} }
public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
{ {
/* NOP */ /* NOP */
} }

7
code/solr/Solr.php
View File

@ -154,9 +154,10 @@ class Solr
static $included = false; static $included = false;
if (!$included) { if (!$included) {
set_include_path(get_include_path() . PATH_SEPARATOR . Director::baseFolder() . '/fulltextsearch/thirdparty/solr-php-client'); $solr_php_path = BASE_PATH . DIRECTORY_SEPARATOR . 'fulltextsearch/thirdparty/solr-php-client';
require_once('Apache/Solr/Service.php'); set_include_path($solr_php_path);
require_once('Apache/Solr/Document.php'); require_once($solr_php_path . DIRECTORY_SEPARATOR . 'Apache/Solr/Service.php');
require_once($solr_php_path . DIRECTORY_SEPARATOR . 'Apache/Solr/Document.php');
$included = true; $included = true;
} }