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

port to 4.1 PHRAS-1831

Browse Source
This commit is contained in:
aina-esokia
2018-11-05 15:02:55 +04:00
parent e113d926c2
commit 2eeb1721e9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/Query.php
View File

@@ -27,8 +27,9 @@ class Query
{ {
$query = $this->root->buildQuery($context); $query = $this->root->buildQuery($context);
if ($query === null) { if ($query === null) {
$query = []; //$query = ['bool'=> ['must' => []]];
$query['bool']['must'] = []; // a null query shoud return no results !
$query = ['constant_score'=> ['filter' => new \stdClass]];
} }
return $query; return $query;

1
lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus.php
View File

@@ -60,6 +60,7 @@ class Thesaurus
// TODO Use bulk queries for performance // TODO Use bulk queries for performance
$concepts = array(); $concepts = array();
foreach ($terms as $index => $term) { foreach ($terms as $index => $term) {
$strict = ($term instanceof AST\TermNode); // a "term" node is [strict group of words]
$concepts[] = $this->findConcepts($term, $lang, $filters[$index], $strict); $concepts[] = $this->findConcepts($term, $lang, $filters[$index], $strict);
} }

2
lib/classes/databox.php
View File

@@ -1217,7 +1217,7 @@ class databox extends base implements ThumbnailedElement
if ($domct !== false) { if ($domct !== false) {
$nodesToDel = []; $nodesToDel = [];
for($n = $domct->documentElement->firstChild; $n; $n = $n->nextSibling) { for($n = $domct->documentElement->firstChild; $n; $n = $n->nextSibling) {
if(!($n->getAttribute('delbranch'))){ if($n->nodeType == XML_ELEMENT_NODE && !($n->getAttribute('delbranch'))){
$nodesToDel[] = $n; $nodesToDel[] = $n;
} }
} }