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

PHRAS-2126_Array-to-String-err-idx_4.1 (#2656)

Browse Source 
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"
This commit is contained in:
jygaulier
2018-07-02 18:41:40 +02:00
committed by GitHub
parent 46cd7c806b
commit 88035173c5
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,8 +157,7 @@ class BulkOperation
foreach ($response['items'] as $key => $item) { foreach ($response['items'] as $key => $item) {
foreach($item as $command=>$result) { // command may be "index" or "delete" foreach($item as $command=>$result) { // command may be "index" or "delete"
if($response['errors'] && $result['status'] >= 400) { // 4xx or 5xx error if($response['errors'] && $result['status'] >= 400) { // 4xx or 5xx error
$err = array_key_exists('error', $result) ? $result['error'] : ($command . " error " . $result['status']); throw new Exception(sprintf('%d: %s', $key, var_export($result, true)));
throw new Exception(sprintf('%d: %s', $key, $err));
} }
} }

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

@@ -71,7 +71,7 @@ class RecordIndex implements MappingProvider
$mapping->addIntegerField('width')->disableIndexing(); $mapping->addIntegerField('width')->disableIndexing();
$mapping->addIntegerField('height')->disableIndexing(); $mapping->addIntegerField('height')->disableIndexing();
$mapping->addIntegerField('size')->disableIndexing(); $mapping->addLongField('size')->disableIndexing();
$mapping->addGeoPointField('location'); $mapping->addGeoPointField('location');

9
lib/Alchemy/Phrasea/SearchEngine/Elastic/MappingBuilder.php
View File

@@ -45,6 +45,15 @@ class MappingBuilder
return $this->mapping->addField(new FieldMapping($name, FieldMapping::TYPE_INTEGER)); return $this->mapping->addField(new FieldMapping($name, FieldMapping::TYPE_INTEGER));
} }
/**
* @param string $name
* @return FieldMapping
*/
public function addLongField($name)
{
return $this->mapping->addField(new FieldMapping($name, FieldMapping::TYPE_LONG));
}
/** /**
* @param string $name * @param string $name
* @return FieldMapping * @return FieldMapping