Accession counter incrementing fix, refs #11700 #681
Conversation
| // If no identifier has been specified, use next available one | ||
| if (!$this->identifier) | ||
| // If identifier has been specified and the mask is enabled, increment the counter | ||
| if (!empty($this->identifier) && QubitAccession::maskEnabled()) |
There was a problem hiding this comment.
We could use self instead of QubitAccession like inside the if.
| { | ||
| $this->identifier = self::nextAvailableIdentifier(); | ||
| self::incrementAccessionCounter(); |
There was a problem hiding this comment.
We may need to wrap the incrementAccessionCounter function content in a transaction too as it may be called from CLI in here after this changes, and the transaction in nextAvailableIdentifier won't be working in that case.
| public static function maskEnabled() | ||
| { | ||
| $setting = QubitSetting::getByName('accession_mask_enabled'); | ||
| return (null === $setting || boolval($setting->getValue(array('sourceCulture' => true)))); |
There was a problem hiding this comment.
This feels wrong to me, are we sure that if the setting is missing (a rare case) we should consider that the mask is enabled? Otherwise, we could use sfConfig to get its value.
There was a problem hiding this comment.
This setting doesn't get created by a migration, alas, and the default behaviour IIRC is to use the mask.
Added helper function to check whether mask's enabled and fixed inconsistent accession counter incrementing. Changes to logic relating to accession identifiers during database insert: * Removed automatic population of identifier, via the mask, if no accession identifier is specified * Added logic to, if an identifier is specified and mask is enabled, increment the accession counter
qubot
force-pushed
the
dev/issue-11700-fix-v2
branch
from
1e1b71a
to
35649a9
Compare
|
@jraddaoui I've wrapped the increment in a transaction and tested. |
Added helper function to check whether mask's enabled and fixed inconsistent
accession counter incrementing.
Changes to logic relating to accession identifiers during database insert:
identifier is specified
the accession counter