diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php index 5d5d57631e..9dd72e7a3f 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php @@ -51,6 +51,8 @@ class ElasticsearchRecordHydrator $record->setOriginalName(igorw\get_in($data, ['original_name'], '')); $record->setRecordId(igorw\get_in($data, ['record_id'], 0)); $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')); $updatedOn = igorw\get_in($data, ['updated_on']); $record->setUpdated($updatedOn ? new \DateTime($updatedOn) : $updatedOn); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php index 187809c573..fab2e099c4 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Fetcher.php @@ -132,7 +132,9 @@ class Fetcher . ", r.sha256" // -- TODO rename in "hash" . ", r.originalname AS original_name" . ", 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" . " ORDER BY r.record_id DESC" . " LIMIT :offset, :limit"; diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php index e577eb6498..52e8e8c0b5 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php @@ -66,6 +66,9 @@ class RecordIndex implements MappingProvider $mapping->addStringField('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('updated_on', FieldMapping::DATE_FORMAT_MYSQL_OR_CAPTION);