hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SearchEngine] Update PR to latest master

Browse Source
This commit is contained in:
Romain Neutron
2012-10-30 11:40:57 +01:00
parent 497b8993fe
commit 0ec2117b60
5 changed files with 129 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
View File

@@ -11,15 +11,14 @@
namespace Alchemy\Phrasea\SearchEngine\SphinxSearch;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
use Alchemy\Phrasea\Exception\RuntimeException;
use Doctrine\Common\Collections\ArrayCollection;
use Silex\Application;
use Symfony\Component\Process\ExecutableFinder;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Process\Process;
require_once __DIR__ . '/../../../../vendor/sphinx/sphinxapi.php';
@@ -45,9 +44,11 @@ class SphinxSearchEngine implements SearchEngineInterface
protected $rt_conn;
protected $configurationPanel;
protected $options;
protected $app;
public function __construct($host, $port, $rt_host, $rt_port)
public function __construct(Application $app, $host, $port, $rt_host, $rt_port)
{
$this->app = $app;
$this->options = new SearchEngineOptions();
$this->sphinx = new \SphinxClient();
@@ -297,9 +298,10 @@ class SphinxSearchEngine implements SearchEngineInterface
try {
$record =
new \record_adapter(
$match['attrs']['sbas_id']
, $match['attrs']['record_id']
, $resultOffset
$this->app,
$match['attrs']['sbas_id'],
$match['attrs']['record_id'],
$resultOffset
);
$results->add($record);