PHRAS-726_delete-candidate

- change : prod / delete candidate does not update records metadata
- change : prod / replace candidate is disabled
- fix : prod / delete candidate is ok

#time 2h
This commit is contained in:
Jean-Yves Gaulier
2016-06-28 15:12:31 +02:00
parent 65e666ee98
commit ef108d543e
2 changed files with 27 additions and 134 deletions

View File

@@ -1294,8 +1294,6 @@ class ThesaurusXmlHttpController extends Controller
public function replaceCandidateJson(Request $request) public function replaceCandidateJson(Request $request)
{ {
$tsbas = [];
$ret = [ $ret = [
'ctermsDeleted' => [], 'ctermsDeleted' => [],
'maxRecsUpdatable' => self::SEARCH_REPLACE_MAXREC, 'maxRecsUpdatable' => self::SEARCH_REPLACE_MAXREC,
@@ -1304,159 +1302,51 @@ class ThesaurusXmlHttpController extends Controller
'msg' => '' 'msg' => ''
]; ];
// group ids by base
$tsbas = [];
foreach ($request->get('id') as $id) { foreach ($request->get('id') as $id) {
$id = explode('.', $id); $id = explode('.', $id);
$sbas_id = array_shift($id); $sbas_id = array_shift($id);
if (!array_key_exists('b' . $sbas_id, $tsbas)) { if (!array_key_exists($sbas_id, $tsbas)) {
$tsbas['b' . $sbas_id] = [ $tsbas[$sbas_id] = [];
'sbas_id' => (int) $sbas_id,
'tids' => [],
'domct' => null,
'tvals' => [],
'lid' => '',
'trids' => []
];
} }
$tsbas['b' . $sbas_id]['tids'][] = implode('.', $id); $tsbas[$sbas_id][] = implode('.', $id);
} }
// first, count the number of records to update // loop on bases
foreach ($tsbas as $ksbas => $sbas) { foreach ($tsbas as $sbas_id => $sbas) {
try { try {
$databox = $this->findDataboxById($sbas['sbas_id']); $databox = $this->findDataboxById($sbas_id);
$connbas = $databox->get_connection(); $domct = $databox->get_dom_cterms();
$tsbas[$ksbas]['domct'] = $databox->get_dom_cterms();
} catch (\Exception $e) { } catch (\Exception $e) {
continue; continue;
} }
if (!$tsbas[$ksbas]['domct']) { if (!$domct) {
continue; continue;
} }
$lids = []; $domct_changed = false;
$xpathct = new \DOMXPath($tsbas[$ksbas]['domct']); $xpathct = new \DOMXPath($domct);
foreach ($sbas['tids'] as $tid) { foreach ($sbas as $tid) {
$xp = '//te[@id="' . $tid . '"]/sy'; $xp = '//te[@id="' . $tid . '"]/sy';
$nodes = $xpathct->query($xp); $nodes = $xpathct->query($xp);
if ($nodes->length == 1) { if ($nodes->length == 1) {
$sy = $nodes->item(0); $sy = $nodes->item(0);
$syid = str_replace('.', 'd', $sy->getAttribute('id')) . 'd'; $te = $sy->parentNode;
$lids[] = $syid; $ret['ctermsDeleted'][] = $sbas_id . '.' . $te->getAttribute('id');
$field = $sy->parentNode->parentNode->getAttribute('field'); $te->parentNode->removeChild($te);
$domct_changed = true;
if (!array_key_exists($field, $tsbas[$ksbas]['tvals'])) {
$tsbas[$ksbas]['tvals'][$field] = [];
}
$tsbas[$ksbas]['tvals'][$field][] = $sy;
} }
} }
if (empty($lids)) { if ($domct_changed && !$request->get('debug')) {
// no cterm was found $databox->saveCterms($domct);
continue;
} }
$tsbas[$ksbas]['lid'] = "'" . implode("','", $lids) . "'";
// count records
$sql = 'SELECT DISTINCT record_id AS r'
. ' FROM thit WHERE value IN (:lids)'
. ' ORDER BY record_id';
$stmt = $connbas->prepare($sql);
$stmt->execute(['lids' => $lids]);
$tsbas[$ksbas]['trids'] = $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
$stmt->closeCursor();
$ret['nRecsToUpdate'] += count($tsbas[$ksbas]['trids']);
} }
if ($ret['nRecsToUpdate'] <= self::SEARCH_REPLACE_MAXREC) { $ret['msg'] = $this->app->trans('prod::thesaurusTab:dlg:%number% record(s) updated', ['%number%' => 0]);
foreach ($tsbas as $sbas) {
try {
$databox = $this->findDataboxById($sbas['sbas_id']);
} catch (\Exception $e) {
continue;
}
// fix caption of records
foreach ($sbas['trids'] as $rid) {
try {
$record = $databox->get_record($rid);
$metadatask = []; // datas to keep
$metadatasd = []; // datas to delete
/* @var $field caption_field */
foreach ($record->get_caption()->get_fields(null, true) as $field) {
$meta_struct_id = $field->get_meta_struct_id();
/* @var $v caption_Field_Value */
$fname = $field->get_name();
if (!array_key_exists($fname, $sbas['tvals'])) {
foreach ($field->get_values() as $v) {
$metadatask[] = [
'meta_struct_id' => $meta_struct_id,
'meta_id' => $v->getId(),
'value' => $v->getValue()
];
}
} else {
foreach ($field->get_values() as $v) {
$keep = true;
$vtxt = $this->getUnicode()->remove_indexer_chars($v->getValue());
/** @var DOMElement $sy */
foreach ($sbas['tvals'][$fname] as $sy) {
if ($sy->getAttribute('w') == $vtxt) {
$keep = false;
}
}
if ($keep) {
$metadatask[] = [
'meta_struct_id' => $meta_struct_id,
'meta_id' => $v->getId(),
'value' => $v->getValue()
];
} else {
$metadatasd[] = [
'meta_struct_id' => $meta_struct_id,
'meta_id' => $v->getId(),
'value' => $request->get('t') ? $request->get('t') : ''
];
}
}
}
}
if (count($metadatasd) > 0) {
if (!$request->get('debug')) {
$record->set_metadatas($metadatasd, true);
$ret['nRecsUpdated']++;
}
}
} catch (\Exception $e) {
continue;
}
}
foreach ($sbas['tvals'] as $tval) {
foreach ($tval as $sy) {
// remove candidate from cterms
$te = $sy->parentNode;
$te->parentNode->removeChild($te);
$ret['ctermsDeleted'][] = $sbas['sbas_id'] . '.' . $te->getAttribute('id');
}
}
if (!$request->get('debug')) {
$databox->saveCterms($sbas['domct']);
}
}
$ret['msg'] = $this->app->trans('prod::thesaurusTab:dlg:%number% record(s) updated', ['%number%' => $ret['nRecsUpdated']]);
} else {
// too many records to update
$ret['msg'] = $this->app->trans('prod::thesaurusTab:dlg:too many (%number%) records to update (limit=%maximum%)', ['%number%' => $ret['nRecsToUpdate'], '%maximum%' => self::SEARCH_REPLACE_MAXREC]);
}
return $this->app->json($ret); return $this->app->json($ret);
} }

View File

@@ -1308,6 +1308,7 @@ function startThesaurus(){
beforeShow:function() beforeShow:function()
{ {
var ret = false; var ret = false;
var replaceBy_option = {{ thesau_languages|length }};
var x = this._showEvent.srcElement ? this._showEvent.srcElement : this._showEvent.target; var x = this._showEvent.srcElement ? this._showEvent.srcElement : this._showEvent.target;
var li = $(x).closest("li"); var li = $(x).closest("li");
@@ -1340,14 +1341,13 @@ function startThesaurus(){
// glue selection info to the tree // glue selection info to the tree
trees.C._selInfos = {'sel':lisel, 'field':field, 'sbas':sbas, 'n':lisel.length} ; trees.C._selInfos = {'sel':lisel, 'field':field, 'sbas':sbas, 'n':lisel.length} ;
// $(this.menu).find('.context-menu-item')[{{ thesau_languages|length }}].addClass('context-menu-item-disabled');
if(lisel.length == 1) if(lisel.length == 1)
{ {
$(this.menu).find('.context-menu-item').eq({{ thesau_languages|length }}).removeClass('context-menu-item-disabled'); // $(this.menu).find('.context-menu-item').eq(replaceBy_option).removeClass('context-menu-item-disabled');
} }
else else
{ {
$(this.menu).find('.context-menu-item').eq({{ thesau_languages|length }}).addClass('context-menu-item-disabled'); // $(this.menu).find('.context-menu-item').eq(replaceBy_option).addClass('context-menu-item-disabled');
} }
} }
else else
@@ -1355,6 +1355,9 @@ function startThesaurus(){
trees.C._selInfos = null; trees.C._selInfos = null;
} }
// replace with is not possible (for now) with es
$(this.menu).find('.context-menu-item').eq(replaceBy_option).addClass('context-menu-item-disabled');
ret = true; ret = true;
} }
return(ret); return(ret);