From 00f8c8735dad2ec1d29c473bca2d7db033f0f87b Mon Sep 17 00:00:00 2001 From: Jean-Yves Gaulier Date: Tue, 21 Jul 2015 16:54:36 +0200 Subject: [PATCH 1/2] #PHRAS-606 #time 4h fix default "binary" thumbnails for stories nb : must re-populate --- lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php | 2 +- .../SearchEngine/Elastic/ElasticsearchRecordHydrator.php | 2 +- .../Elastic/Indexer/Record/Hydrator/CoreHydrator.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php index bcd8ed10f8..4f640c191d 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php +++ b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php @@ -118,7 +118,7 @@ class ElasticsearchRecord implements RecordInterface, MutableRecordInterface public function setMimeType($mimeType) { if (null === $mimeType || '' === $mimeType) { - $mimeType = 'application/octet-stream'; + $mimeType = $this->isStory() ? 'regroup_doc' : 'application/octet-stream'; } $this->mimeType = $mimeType; } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php index 819e8f9b73..fd6451d485 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php @@ -44,7 +44,7 @@ class ElasticsearchRecordHydrator $createdOn = igorw\get_in($data, ['created_on']); $record->setCreated($createdOn ? new \DateTime($createdOn) : $createdOn); $record->setDataboxId(igorw\get_in($data, ['databox_id'], 0)); - $record->setIsStory(igorw\get_in($data, ['type']) === 'story'); + $record->setIsStory(igorw\get_in($data, ['record_type']) === 'story'); $record->setMimeType(igorw\get_in($data, ['mime'], 'application/octet-stream')); $record->setOriginalName(igorw\get_in($data, ['original_name'], '')); $record->setRecordId(igorw\get_in($data, ['record_id'], 0)); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php index cc9306785e..850e496553 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php @@ -51,7 +51,7 @@ class CoreHydrator implements HydratorInterface unset($record['parent_record_id']); if (!$record['mime']) { - $record['mime'] = 'application/octet-stream'; + $record['mime'] = ''; } return $record; From 82a8c977901caa2bfd0bdc415eec512dd5224f43 Mon Sep 17 00:00:00 2001 From: Jean-Yves Gaulier Date: Tue, 21 Jul 2015 18:23:21 +0200 Subject: [PATCH 2/2] #PHRAS-606 #time 5m fix: mime is forced into es --- lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php | 2 +- .../Elastic/Indexer/Record/Hydrator/CoreHydrator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php index 4f640c191d..bcd8ed10f8 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php +++ b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php @@ -118,7 +118,7 @@ class ElasticsearchRecord implements RecordInterface, MutableRecordInterface public function setMimeType($mimeType) { if (null === $mimeType || '' === $mimeType) { - $mimeType = $this->isStory() ? 'regroup_doc' : 'application/octet-stream'; + $mimeType = 'application/octet-stream'; } $this->mimeType = $mimeType; } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php index 850e496553..c89a254148 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/Record/Hydrator/CoreHydrator.php @@ -51,7 +51,7 @@ class CoreHydrator implements HydratorInterface unset($record['parent_record_id']); if (!$record['mime']) { - $record['mime'] = ''; + $record['mime'] = ($record['record_type'] == SearchEngineInterface::GEM_TYPE_STORY) ? 'regroup_doc' : 'application/octet-stream'; } return $record;