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

Merge pull request #1613 from jygaulier/PHRAS-888_N+1-GetCaption

Browse Source 
#PHRAS-888 time 10h
This commit is contained in:
jygaulier
2016-01-07 14:08:13 +01:00
parent edefe88e59 f4c834d68c
commit f8efdda22c
3 changed files with 140 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
lib/classes/caption/Field/Value.php
View File

@@ -15,6 +15,9 @@ use Alchemy\Phrasea\Vocabulary;
class caption_Field_Value implements cache_cacheableInterface
{
const RETRIEVE_VALUES = true;
const DONT_RETRIEVE_VALUES = false;
/** @var int */
protected $id;
@@ -55,16 +58,19 @@ class caption_Field_Value implements cache_cacheableInterface
* @param databox_field $databox_field
* @param record_adapter $record
* @param mixed $id
* @param bool $retrieveValues
* @return \caption_Field_Value
*/
public function __construct(Application $app, databox_field $databox_field, record_adapter $record, $id)
public function __construct(Application $app, databox_field $databox_field, record_adapter $record, $id, $retrieveValues = self::RETRIEVE_VALUES)
{
$this->id = (int) $id;
$this->databox_field = $databox_field;
$this->record = $record;
$this->app = $app;
$this->retrieveValues();
if($retrieveValues == self::RETRIEVE_VALUES) {
$this->retrieveValues();
}
}
public function getQjs()
@@ -72,6 +78,53 @@ class caption_Field_Value implements cache_cacheableInterface
return $this->qjs;
}
public function injectValues($value, $VocabularyType, $VocabularyId)
{
$this->value = StringHelper::crlfNormalize($value);
try {
$this->VocabularyType = $VocabularyType ? Vocabulary\Controller::get($this->app, $VocabularyType) : null;
$this->VocabularyId = $VocabularyId;
} catch (\InvalidArgumentException $e) {
}
if ($this->VocabularyType) {
/**
* Vocabulary Control has been deactivated
*/
if ( ! $this->databox_field->getVocabularyControl()) {
$this->removeVocabulary();
}
/**
* Vocabulary Control has changed
*/
elseif ($this->databox_field->getVocabularyControl()->getType() !== $this->VocabularyType->getType()) {
$this->removeVocabulary();
}
/**
* Current Id is not available anymore
*/
elseif ( ! $this->VocabularyType->validate($this->VocabularyId)) {
$this->removeVocabulary();
}
/**
* String equivalence has changed
*/
elseif ($this->VocabularyType->getValue($this->VocabularyId) !== $this->value) {
$this->set_value($this->VocabularyType->getValue($this->VocabularyId));
}
}
$datas = [
'value' => $this->value,
'vocabularyId' => $this->VocabularyId,
'vocabularyType' => $this->VocabularyType ? $this->VocabularyType->getType() : null,
];
$this->set_data_to_cache($datas);
}
protected function retrieveValues()
{
try {
@@ -95,47 +148,13 @@ class caption_Field_Value implements cache_cacheableInterface
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$this->value = $row ? StringHelper::crlfNormalize($row['value']) : null;
try {
$this->VocabularyType = $row['VocabularyType'] ? Vocabulary\Controller::get($this->app, $row['VocabularyType']) : null;
$this->VocabularyId = $row['VocabularyId'];
} catch (\InvalidArgumentException $e) {
if($row) {
$this->injectValues($row['value'], $row['VocabularyType'], $row['VocabularyId']);
}
if ($this->VocabularyType) {
/**
* Vocabulary Control has been deactivated
*/
if ( ! $this->databox_field->getVocabularyControl()) {
$this->removeVocabulary();
}
/**
* Vocabulary Control has changed
*/ elseif ($this->databox_field->getVocabularyControl()->getType() !== $this->VocabularyType->getType()) {
$this->removeVocabulary();
}
/**
* Current Id is not available anymore
*/ elseif ( ! $this->VocabularyType->validate($this->VocabularyId)) {
$this->removeVocabulary();
}
/**
* String equivalence has changed
*/ elseif ($this->VocabularyType->getValue($this->VocabularyId) !== $this->value) {
$this->set_value($this->VocabularyType->getValue($this->VocabularyId));
}
else {
$this->injectValues(null, null, null);
}
$datas = [
'value' => $this->value,
'vocabularyId' => $this->VocabularyId,
'vocabularyType' => $this->VocabularyType ? $this->VocabularyType->getType() : null,
];
$this->set_data_to_cache($datas);
return $this;
}