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

PHRAS-374 #time 3h

Browse Source 
fix : console build-subdefs can build non existing subdefs, ex. after adding a new subdef name in admin.
This commit is contained in:
Jean-Yves Gaulier
2015-09-02 13:49:31 +02:00
parent fc215f79c1
commit 12912a309a
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/Alchemy/Phrasea/Command/BuildSubdefs.php
View File

@@ -12,13 +12,16 @@
namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Alchemy\Phrasea\Media\SubdefGenerator;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\SQLParserUtils;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Helper\HelperSet;
use Symfony\Component\Console\Helper\ProgressBar;
use media_subdef;
class BuildSubdefs extends Command
{
/**
@@ -67,14 +70,9 @@ class BuildSubdefs extends Command
return;
}
$sqlCount = "
SELECT COUNT(DISTINCT(r.record_id)) AS nb_records
FROM record r
INNER JOIN subdef s
ON (r.record_id = s.record_id)
WHERE s.name IN (?)
AND r.type IN (?)
";
$sqlCount = "SELECT COUNT(DISTINCT(r.record_id)) AS nb_records"
. " FROM record r LEFT JOIN subdef s ON (r.record_id = s.record_id AND s.name IN (?))"
. " WHERE r.type IN (?)";
$types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY);
$params = array($subdefsName, $recordsType);
@@ -98,9 +96,9 @@ class BuildSubdefs extends Command
if (false === $withSubstitution) {
if (true === $substitutionOnly) {
$sqlCount .= " AND (s.substit = 1)";
$sqlCount .= " AND (ISNULL(s.substit) OR s.substit = 1)";
} else {
$sqlCount .= " AND (s.substit = 0)";
$sqlCount .= " AND (ISNULL(s.substit) OR s.substit = 0)";
}
} elseif ($substitutionOnly) {
throw new InvalidArgumentException('Conflict, you can not ask for --substitution-only && --with-substitution parameters at the same time');
@@ -110,6 +108,8 @@ class BuildSubdefs extends Command
$databox = $this->container->findDataboxById($input->getArgument('databox'));
$output->writeln($sqlCount);
$connection = $databox->get_connection();
$stmt = $connection->prepare($sqlCount);
$stmt->execute($stmtParams);
@@ -120,20 +120,19 @@ class BuildSubdefs extends Command
return;
}
$progress = $this->getHelperSet()->get('progress');
/** @var HelperSet $helperSet */
$helperSet = $this->getHelperSet();
/** @var ProgressBar $progress */
$progress = $helperSet->get('progress');
$progress->start($output, $totalRecords);
$progress->display();
$sql = "
SELECT DISTINCT(r.record_id)
FROM record r
INNER JOIN subdef s
ON (r.record_id = s.record_id)
WHERE s.name IN (?)
AND r.type IN (?)
";
$sql = "SELECT DISTINCT(r.record_id)"
. " FROM record r LEFT JOIN subdef s ON (r.record_id = s.record_id AND s.name IN (?))"
. " WHERE r.type IN (?)";
$types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY);
$params = array($subdefsName, $recordsType);
@@ -153,9 +152,9 @@ class BuildSubdefs extends Command
if (false === $withSubstitution) {
if (true === $substitutionOnly) {
$sql .= " AND (s.substit = 1)";
$sql .= " AND (ISNULL(s.substit) OR s.substit = 1)";
} else {
$sql .= " AND (s.substit = 0)";
$sql .= " AND (ISNULL(s.substit) OR s.substit = 0)";
}
}
@@ -171,7 +170,8 @@ class BuildSubdefs extends Command
$record = new \record_adapter($this->container, $databox->get_sbas_id(), $row['record_id']);
$subdefs = array_filter($record->get_subdefs(), function($subdef) use ($subdefsName) {
/** @var media_subdef[] $subdefs */
$subdefs = array_filter($record->get_subdefs(), function(media_subdef $subdef) use ($subdefsName) {
return in_array($subdef->get_name(), $subdefsName);
});
@@ -182,7 +182,9 @@ class BuildSubdefs extends Command
}
}
$record->generate_subdefs($databox, $this->container, $subdefsName);
/** @var SubdefGenerator $subdefGenerator */
$subdefGenerator = $this->container['subdef.generator'];
$subdefGenerator->generateSubdefs($record, $subdefsName);
$stmt->closeCursor();