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

PHRAS-676 #time 3h

Browse Source 
new : returns facet on "type" (image, video, ...)
new : query on pseudo-field "type", ex:  "type:image"
This commit is contained in:
Jean-Yves Gaulier
2015-09-04 14:34:25 +02:00
parent 2643d697c2
commit e8f61a443b
7 changed files with 530 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
grammar/query.pp
View File

@@ -29,6 +29,7 @@
// Rest
%token database database
%token collection collection
%token type type
%token id id|recordid
%token word [^\s()\[\]:<>≤≥=]+
@@ -55,6 +56,7 @@ ternary:
quaternary:
::database:: ::colon:: string() #database
| ::collection:: ::colon:: string() #collection
| ::type:: ::colon:: string() #type
| ::id:: ::colon:: string() #id
| quinary()
@@ -136,6 +138,7 @@ keyword:
| <or>
| <database>
| <collection>
| <type>
| <id>
symbol:

34
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TypeExpression.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
class TypeExpression extends Node
{
private $typeName;
public function __construct($typeName)
{
$this->typeName = $typeName;
}
public function buildQuery(QueryContext $context)
{
return [
'term' => [
'type' => $this->typeName
]
];
}
public function getTermNodes()
{
return array();
}
public function __toString()
{
return sprintf('<type:%s>', $this->typeName);
}
}

5
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
View File

@@ -444,6 +444,11 @@ class ElasticSearchEngine implements SearchEngineInterface
$base_facet_agg['terms']['field'] = 'databox_name';
$aggs['Base'] = $base_facet_agg;
// We always want a type facet right now
$base_facet_agg = array();
$base_facet_agg['terms']['field'] = 'type';
$aggs['Type'] = $base_facet_agg;
$structure = $this->getLimitedStructure($options);
foreach ($structure->getFacetFields() as $name => $field) {
// 2015-05-26 (mdarse) Removed databox filtering.

124
lib/Alchemy/Phrasea/SearchEngine/Elastic/QueryParser.php
View File

@@ -441,72 +441,72 @@ class QueryParser
function parserPerformAction(&$thisS, &$yy, $yystate, &$s, $o)
{
/* this == yyval */
/* this == yyval */
switch ($yystate) {
case 1:
switch ($yystate) {
case 1:
return $thisS;
break;
case 2:
break;
case 2:
// $thisS = sprintf('(%s DEF_OP %s)', $s[$o-1]->text, $s[$o]->text);
$thisS = new AST\AndExpression($s[$o-1]->text, $s[$o]->text);
break;
case 4:
break;
case 4:
$thisS = new AST\AndExpression($s[$o-2]->text, $s[$o]->text);
break;
case 5:
break;
case 5:
$thisS = new AST\OrExpression($s[$o-2]->text, $s[$o]->text);
break;
case 6:
break;
case 6:
$thisS = new AST\InExpression($s[$o]->text, $s[$o-2]->text);
break;
case 7:
break;
case 7:
$thisS = $s[$o-1];
break;
case 10:
break;
case 10:
$thisS = new AST\KeywordNode($s[$o]->text);
break;
case 11:
break;
case 11:
$thisS = new AST\PrefixNode($s[$o-1]->text);
break;
case 12:
break;
case 12:
$thisS = new AST\TextNode($s[$o]->text);
break;
case 13:
break;
case 13:
$thisS = new AST\QuotedTextNode($s[$o]->text);
break;
}
break;
}
}
@@ -907,49 +907,49 @@ break;
function LexerPerformAction($avoidingNameCollisions, $YY_START = null)
{
;
switch($avoidingNameCollisions) {
case 0:/* skip whitespace */
break;
case 1:return 7;
break;
case 2:return 7;
break;
case 3:return 7;
break;
case 4:return 8;
break;
case 5:return 8;
break;
case 6:return 8;
break;
case 7:return 9;
break;
case 8:return 9;
break;
case 9:return 9;
break;
case 10:return 11;
break;
case 11:return 12;
break;
case 12:return 16;
break;
case 13:
;
switch($avoidingNameCollisions) {
case 0:/* skip whitespace */
break;
case 1:return 7;
break;
case 2:return 7;
break;
case 3:return 7;
break;
case 4:return 8;
break;
case 5:return 8;
break;
case 6:return 8;
break;
case 7:return 9;
break;
case 8:return 9;
break;
case 9:return 9;
break;
case 10:return 11;
break;
case 11:return 12;
break;
case 12:return 16;
break;
case 13:
$this->begin('literal');
break;
case 14:
break;
case 14:
$this->popState();
break;
case 15:return 17;
break;
case 16:return 15;
break;
case 17:return 5;
break;
}
break;
case 15:return 17;
break;
case 16:return 15;
break;
case 17:return 5;
break;
}
}
}

2
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
View File

@@ -75,6 +75,8 @@ class FacetsResponse implements JsonSerializable
return sprintf('collection:%s', $this->escaper->escapeWord($value));
case 'Base':
return sprintf('database:%s', $this->escaper->escapeWord($value));
case 'Type':
return sprintf('type:%s', $this->escaper->escapeWord($value));
default:
return sprintf('r"%s" IN %s', $this->escaper->escapeRaw($value), $name);
}

1
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/NodeTypes.php
View File

@@ -22,6 +22,7 @@ class NodeTypes
const TEXT = '#text';
const CONTEXT = '#context';
const COLLECTION = '#collection';
const TYPE = '#type';
const DATABASE = '#database';
const IDENTIFIER = '#id';
// Token types for leaf nodes

13
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php
View File

@@ -88,6 +88,9 @@ class QueryVisitor implements Visit
case NodeTypes::COLLECTION:
return $this->visitCollectionNode($element);
case NodeTypes::TYPE:
return $this->visitTypeNode($element);
case NodeTypes::IDENTIFIER:
return $this->visitIdentifierNode($element);
@@ -279,6 +282,16 @@ class QueryVisitor implements Visit
return new AST\CollectionExpression($collectionName);
}
private function visitTypeNode(Element $element)
{
if ($element->getChildrenNumber() !== 1) {
throw new \Exception('Type filter can only have a single child.');
}
$typeName = $element->getChild(0)->getValue()['value'];
return new AST\TypeExpression($typeName);
}
private function visitIdentifierNode(Element $element)
{
if ($element->getChildrenNumber() !== 1) {