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

Proper caching of names in databox_descriptionStructure

Browse Source
This commit is contained in:
Benoît Burnichon
2016-03-31 15:27:09 +02:00
parent 3b49f58ad7
commit 840aa86bb4
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/classes/databox/descriptionStructure.php
View File

@@ -1,5 +1,4 @@
<?php <?php
/* /*
* This file is part of Phraseanet * This file is part of Phraseanet
* *
@@ -13,15 +12,17 @@ use Assert\Assertion;
class databox_descriptionStructure implements IteratorAggregate, Countable class databox_descriptionStructure implements IteratorAggregate, Countable
{ {
/** @var databox_field[] */ /**
* @var databox_field[]
*/
protected $elements = []; protected $elements = [];
/** /**
* Cache array for the get element by name function * Cache array for the get element by name function
* *
* @var array<string,int> * @var array<string,int>|null
*/ */
protected $cache_name_id = []; protected $cache_name_id;
/** /**
* @param databox_field[] $fields * @param databox_field[] $fields
@@ -51,6 +52,10 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
{ {
$this->elements[$field->get_id()] = $field; $this->elements[$field->get_id()] = $field;
if (null !== $this->cache_name_id) {
$this->cache_name_id[$field->get_name()] = $field->get_id();
}
return $this; return $this;
} }
@@ -60,8 +65,9 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
*/ */
public function remove_element(databox_field $field) public function remove_element(databox_field $field)
{ {
if (isset($this->elements[$field->get_id()])) if (isset($this->elements[$field->get_id()])) {
unset($this->elements[$field->get_id()]); unset($this->elements[$field->get_id()], $this->cache_name_id[$field->get_name()]);
}
return $this; return $this;
} }
@@ -75,14 +81,14 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
} }
/** /**
*
* @param int $id * @param int $id
* @return databox_field * @return databox_field
*/ */
public function get_element($id) public function get_element($id)
{ {
if ( ! isset($this->elements[$id])) if (!isset($this->elements[$id])) {
throw new Exception_Databox_FieldNotFound (); throw new Exception_Databox_FieldNotFound ();
}
return $this->elements[$id]; return $this->elements[$id];
} }
@@ -93,23 +99,25 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
*/ */
public function get_element_by_name($name) public function get_element_by_name($name)
{ {
$name = databox_field::generateName($name); if (null === $this->cache_name_id) {
$this->cache_name_id = [];
if (isset($this->cache_name_id[$name])) {
return $this->elements[$this->cache_name_id[$name]];
}
foreach ($this->elements as $id => $meta) { foreach ($this->elements as $id => $meta) {
if ($meta->get_name() === $name) { $this->cache_name_id[$meta->get_name()] = $id;
$this->cache_name_id[$name] = $id;
return $meta;
} }
} }
return null; $name = databox_field::generateName($name);
return isset($this->cache_name_id[$name])
? $this->elements[$this->cache_name_id[$name]]
: null;
} }
/**
* @param string $label
* @return databox_field|null
*/
public function get_dces_field($label) public function get_dces_field($label)
{ {
foreach ($this->elements as $field) { foreach ($this->elements as $field) {
@@ -125,13 +133,16 @@ class databox_descriptionStructure implements IteratorAggregate, Countable
/** /**
* @param string $id * @param string $id
* @return boolean * @return bool
*/ */
public function isset_element($id) public function isset_element($id)
{ {
return isset($this->elements[$id]); return isset($this->elements[$id]);
} }
/**
* @return array
*/
public function toArray() public function toArray()
{ {
return array_map(function (databox_field $element) { return array_map(function (databox_field $element) {