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

Remove use of databox singleton

Browse Source
This commit is contained in:
Romain Neutron
2012-07-26 12:28:41 +02:00
parent 0deed1fc7b
commit fb95aad718
20 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/searchEngine/adapter/phrasea/engine.class.php
View File

@@ -427,7 +427,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
if ($this->results[$sbas_id])
$nbanswers += $this->results[$sbas_id]["nbanswers"];
$logger = $session->get_logger(databox::get_instance($sbas_id));
$logger = $session->get_logger($appbox->get_databox($sbas_id));
$conn2 = connection::getPDOConnection($sbas_id);
@@ -558,7 +558,6 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
if ( ! isset($this->queries[$databox->get_sbas_id()]))
continue;
//$databox = databox::get_instance($sbas_id);
$sbas_id = $databox->get_sbas_id();
$this->colls[$sbas_id] = array();
foreach ($databox->get_collections() as $coll) {

9
lib/classes/searchEngine/adapter/sphinx/engine.class.php
View File

@@ -97,9 +97,10 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i
$filters = array();
$appbox = \appbox::get_instance(\bootstrap::getCore());
foreach ($sbas_ids as $sbas_id) {
$databox = databox::get_instance($sbas_id);
$fields = $databox->get_meta_structure();
$fields = $appbox->get_databox($sbas_id)->get_meta_structure();
foreach ($fields as $field) {
if ( ! in_array($field->get_id(), $options->get_fields()))
@@ -136,12 +137,12 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i
$this->sphinx->SetFilter('crc_struct_id', $filters);
}
$appbox = \appbox::get_instance(\bootstrap::getCore());
/**
* @todo : enhance : check status better
*/
foreach ($sbas_ids as $sbas_id) {
$databox = databox::get_instance($sbas_id);
$s_status = $databox->get_statusbits();
$s_status = $appbox->get_databox($sbas_id)->get_statusbits();
$status_opts = $options->get_status();
foreach ($s_status as $n => $status) {
if ( ! array_key_exists($n, $status_opts))