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

OK to test

Browse Source
This commit is contained in:
jygaulier
2020-06-04 20:54:21 +02:00
parent cdadb3acc4
commit 0b099878f5
2 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
lib/Alchemy/Phrasea/Controller/Api/V3/V3MetadatasController.php
View File

@@ -48,18 +48,18 @@ class V3MetadatasController extends Controller
return $this->app['controller.api.v1']->getBadRequestAction($request, 'Bad JSON'); return $this->app['controller.api.v1']->getBadRequestAction($request, 'Bad JSON');
} }
$ret = [ $debug = [
'metadatas_ops' => null, 'metadatas_ops' => null,
'sb_ops' => null, 'sb_ops' => null,
]; ];
try { try {
// do metadatas ops // do metadatas ops
if (is_array($b->metadatas)) { if (is_array($b->metadatas)) {
$ret['metadatas_ops'] = $this->do_metadatas($struct, $record, $b->metadatas); $debug['metadatas_ops'] = $this->do_metadatas($struct, $record, $b->metadatas);
} }
// do sb ops // do sb ops
if (is_array($b->status)) { if (is_array($b->status)) {
$ret['sb_ops'] = $this->do_status($struct, $record, $b->status); $debug['sb_ops'] = $this->do_status($struct, $record, $b->status);
} }
} }
catch (Exception $e) { catch (Exception $e) {
@@ -69,6 +69,9 @@ class V3MetadatasController extends Controller
); );
} }
// @todo Move event dispatch inside record_adapter class (keeps things encapsulated)
$this->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($record));
$ret = $this->getResultHelpers()->listRecord($request, $record, $this->getAclForUser()); $ret = $this->getResultHelpers()->listRecord($request, $record, $this->getAclForUser());
return Result::create($request, $ret)->createResponse(); return Result::create($request, $ret)->createResponse();
@@ -92,10 +95,12 @@ class V3MetadatasController extends Controller
{ {
$structByKey = []; $structByKey = [];
$nameToStrucId = []; $nameToStrucId = [];
$allStructFields = [];
foreach ($struct as $f) { foreach ($struct as $f) {
$nameToStrucId[$f->get_name()] = $f->get_id(); $nameToStrucId[$f->get_name()] = $f->get_id();
$structByKey[$f->get_id()] = $f; $allStructFields[$f->get_id()] = $f;
$structByKey[$f->get_name()] = &$structByKey[$f->get_id()]; $structByKey[$f->get_id()] = &$allStructFields[$f->get_id()];;
$structByKey[$f->get_name()] = &$allStructFields[$f->get_id()];
} }
$metadatas_ops = []; $metadatas_ops = [];
@@ -107,7 +112,8 @@ class V3MetadatasController extends Controller
// select fields that match meta_struct_id or field_name (can be arrays) // select fields that match meta_struct_id or field_name (can be arrays)
$fields_list = null; // to filter caption_fields from record, default all $fields_list = null; // to filter caption_fields from record, default all
$struct_fields = []; // struct fields that match meta_struct_id or field_name $struct_fields = []; // struct fields that match meta_struct_id or field_name
if(($field_keys = $_m->meta_struct_id ? $_m->meta_struct_id : $_m->field_name) !== null) { // can be null if none defined (=match all) $field_keys = $_m->meta_struct_id ? $_m->meta_struct_id : $_m->field_name; // can be null if none defined (=match all)
if($field_keys !== null) {
if (!is_array($field_keys)) { if (!is_array($field_keys)) {
$field_keys = [$field_keys]; $field_keys = [$field_keys];
} }
@@ -119,6 +125,10 @@ class V3MetadatasController extends Controller
} }
} }
} }
else {
// no meta_struct_id, no field_name --> match all struct fields !
$struct_fields = $allStructFields;
}
$caption_fields = $record->get_caption()->get_fields($fields_list, true); $caption_fields = $record->get_caption()->get_fields($fields_list, true);
$meta_id = is_null($_m->meta_id) ? null : (int)($_m->meta_id); $meta_id = is_null($_m->meta_id) ? null : (int)($_m->meta_id);
@@ -133,11 +143,15 @@ class V3MetadatasController extends Controller
$values = []; $values = [];
if(is_array($_m->value)) { if(is_array($_m->value)) {
foreach ($_m->value as $v) { foreach ($_m->value as $v) {
$values[] = is_null($v) ? null : (string)$v; if(($v = trim((string)$v)) !== '') {
$values[] = $v;
}
} }
} }
else { else {
$values = is_null($_m->value) ? [] : [(string)($_m->value)]; if(($v = trim((string)($_m->value))) !== '') {
$values[] = $v;
}
} }
if(!($action = (string)($_m->action))) { if(!($action = (string)($_m->action))) {
@@ -167,7 +181,7 @@ class V3MetadatasController extends Controller
$metadatas_ops = array_merge($metadatas_ops, $ops); $metadatas_ops = array_merge($metadatas_ops, $ops);
} }
// $record->set_metadatas($metadatas_ops, true); $record->set_metadatas($metadatas_ops, true);
return $metadatas_ops; return $metadatas_ops;
} }
@@ -198,9 +212,6 @@ class V3MetadatasController extends Controller
$record->setStatus(strrev($datas)); $record->setStatus(strrev($datas));
// @todo Move event dispatch inside record_adapter class (keeps things encapsulated)
$this->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($record));
return ["status" => $this->getResultHelpers()->listRecordStatus($record)]; return ["status" => $this->getResultHelpers()->listRecordStatus($record)];
} }
@@ -232,12 +243,12 @@ class V3MetadatasController extends Controller
// if one field was multi-valued and no meta_id was set, we must delete all values // if one field was multi-valued and no meta_id was set, we must delete all values
foreach ($caption_fields as $cf) { foreach ($caption_fields as $cf) {
if ($cf->is_multi() && is_null($meta_id)) { foreach ($cf->get_values() as $field_value) {
foreach ($cf->get_values() as $field_value) { if (is_null($meta_id) || $field_value->getId() === (int)$meta_id) {
$ops[] = [ $ops[] = [
'meta_struct_id' => $cf->get_meta_struct_id(), 'meta_struct_id' => $cf->get_meta_struct_id(),
'meta_id' => $field_value->getId(), 'meta_id' => $field_value->getId(),
'value' => null 'value' => ''
]; ];
} }
} }
@@ -247,7 +258,7 @@ class V3MetadatasController extends Controller
if($sf->is_multi()) { if($sf->is_multi()) {
// add the non-null value(s) // add the non-null value(s)
foreach ($values as $value) { foreach ($values as $value) {
if (!is_null($value)) { if ($value) {
$ops[] = [ $ops[] = [
'meta_struct_id' => $sf->get_id(), 'meta_struct_id' => $sf->get_id(),
'meta_id' => $meta_id, // can be null 'meta_id' => $meta_id, // can be null
@@ -261,11 +272,13 @@ class V3MetadatasController extends Controller
if(count($values) > 1) { if(count($values) > 1) {
throw new Exception(sprintf("setting mono-valued (%s) requires only one value.", $sf->get_name())); throw new Exception(sprintf("setting mono-valued (%s) requires only one value.", $sf->get_name()));
} }
$ops[] = [ if( ($value = $values[0]) ) {
'meta_struct_id' => $sf->get_id(), $ops[] = [
'meta_id' => $meta_id, // probably null, 'meta_struct_id' => $sf->get_id(),
'value' => $values[0] 'meta_id' => $meta_id, // probably null,
]; 'value' => $value
];
}
} }
} }
@@ -288,15 +301,12 @@ class V3MetadatasController extends Controller
if(!$sf->is_multi()) { if(!$sf->is_multi()) {
throw new Exception(sprintf("can't \"add\" to mono-valued (%s).", $sf->get_name())); throw new Exception(sprintf("can't \"add\" to mono-valued (%s).", $sf->get_name()));
} }
// add the non-null value(s)
foreach ($values as $value) { foreach ($values as $value) {
if (!is_null($value)) { $ops[] = [
$ops[] = [ 'meta_struct_id' => $sf->get_id(),
'meta_struct_id' => $sf->get_id(), 'meta_id' => null,
'meta_id' => null, 'value' => $value
'value' => $value ];
];
}
} }
} }
@@ -316,6 +326,8 @@ class V3MetadatasController extends Controller
{ {
$ops = []; $ops = [];
$replace_with = trim((string)$replace_with);
foreach ($caption_fields as $cf) { foreach ($caption_fields as $cf) {
// match all ? // match all ?
if(is_null($meta_id) && count($values) == 0) { if(is_null($meta_id) && count($values) == 0) {
@@ -343,8 +355,8 @@ class V3MetadatasController extends Controller
foreach ($values as $value) { foreach ($values as $value) {
foreach ($cf->get_values() as $field_value) { foreach ($cf->get_values() as $field_value) {
$rw = $replace_with; $rw = $replace_with;
if($match_method=='regexp' && !is_null($replace_with)) { if($match_method=='regexp' && $rw != '') {
$rw = preg_replace($value, $replace_with, $field_value->getValue()); $rw = preg_replace($value, $rw, $field_value->getValue());
} }
if ($this->match($value, $match_method, $field_value->getValue())) { if ($this->match($value, $match_method, $field_value->getValue())) {
$ops[] = [ $ops[] = [
@@ -366,17 +378,5 @@ class V3MetadatasController extends Controller
private function getResultHelpers() private function getResultHelpers()
{ {
return $this->app['controller.api.v3.resulthelpers']; return $this->app['controller.api.v3.resulthelpers'];
/*
static $rh = null;
if(is_null($rh)) {
$rh = new V3ResultHelpers(
$this->getConf(),
$this->app['media_accessor.subdef_url_generator'],
$this->getAuthenticator()
);
}
return $rh;
*/
} }
} }

16
lib/classes/record/adapter.php
View File

@@ -1054,10 +1054,13 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
} }
} }
if (trim($params['meta_id']) !== '') { $tmp_val = trim($params['value']);
$tmp_val = trim($params['value']);
$caption_field_value = $caption_field->get_value($params['meta_id']); if (trim($params['meta_id']) !== '') {
if(is_null($caption_field_value = $caption_field->get_value($params['meta_id']))) {
return $this;
}
if ($tmp_val === '') { if ($tmp_val === '') {
$caption_field_value->delete(); $caption_field_value->delete();
@@ -1068,8 +1071,11 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
$caption_field_value->setVocab($vocab, $vocab_id); $caption_field_value->setVocab($vocab, $vocab_id);
} }
} }
} else { }
$caption_field_value = caption_Field_Value::create($this->app, $databox_field, $this, $params['value'], $vocab, $vocab_id); else {
if($tmp_val !== '') {
caption_Field_Value::create($this->app, $databox_field, $this, $params['value'], $vocab, $vocab_id);
}
} }
return $this; return $this;