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

PHRAS-1260_INDEX-WIDTH-HEIGHT

Browse Source 
- new : added with & height of document to es
This commit is contained in:
Jean-Yves Gaulier
2016-11-02 17:29:20 +01:00
parent 41be6154ed
commit 68ab86d9d4
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php
View File

@@ -51,6 +51,8 @@ class ElasticsearchRecordHydrator
$record->setOriginalName(igorw\get_in($data, ['original_name'], '')); $record->setOriginalName(igorw\get_in($data, ['original_name'], ''));
$record->setRecordId(igorw\get_in($data, ['record_id'], 0)); $record->setRecordId(igorw\get_in($data, ['record_id'], 0));
$record->setSha256(igorw\get_in($data, ['sha256'], '')); $record->setSha256(igorw\get_in($data, ['sha256'], ''));
$record->setWidth(igorw\get_in($data, ['width'], 0));
$record->setHeight(igorw\get_in($data, ['height'], 0));
$record->setType(igorw\get_in($data, ['type'], 'unknown')); $record->setType(igorw\get_in($data, ['type'], 'unknown'));
$updatedOn = igorw\get_in($data, ['updated_on']); $updatedOn = igorw\get_in($data, ['updated_on']);
$record->setUpdated($updatedOn ? new \DateTime($updatedOn) : $updatedOn); $record->setUpdated($updatedOn ? new \DateTime($updatedOn) : $updatedOn);

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php
View File

@@ -132,7 +132,9 @@ class Fetcher
. ", r.sha256" // -- TODO rename in "hash" . ", r.sha256" // -- TODO rename in "hash"
. ", r.originalname AS original_name" . ", r.originalname AS original_name"
. ", r.mime, r.type, r.parent_record_id, r.credate AS created_on, r.moddate AS updated_on" . ", r.mime, r.type, r.parent_record_id, r.credate AS created_on, r.moddate AS updated_on"
. " FROM record r INNER JOIN coll c ON (c.coll_id = r.coll_id)" . ", subdef.width, subdef.height"
. " FROM (record r INNER JOIN coll c ON (c.coll_id = r.coll_id))"
. " LEFT JOIN subdef ON subdef.record_id=r.record_id AND subdef.name='document'"
. " -- WHERE" . " -- WHERE"
. " ORDER BY r.record_id DESC" . " ORDER BY r.record_id DESC"
. " LIMIT :offset, :limit"; . " LIMIT :offset, :limit";

3
lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php
View File

@@ -66,6 +66,9 @@ class RecordIndex implements MappingProvider
$mapping->addStringField('type')->disableAnalysis(); $mapping->addStringField('type')->disableAnalysis();
$mapping->addStringField('record_type')->disableAnalysis(); $mapping->addStringField('record_type')->disableAnalysis();
$mapping->addIntegerField('width')->disableIndexing();
$mapping->addIntegerField('height')->disableIndexing();
$mapping->addDateField('created_on', FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION); $mapping->addDateField('created_on', FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION);
$mapping->addDateField('updated_on', FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION); $mapping->addDateField('updated_on', FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION);