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

Revert "PHRAS-524"

Browse Source 
This reverts commit a7af07b00c.
This commit is contained in:
Benoît Burnichon
2015-05-13 13:43:07 +02:00
parent 354eb4b60e
commit 96df8cc926
4 changed files with 56 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Alchemy/Phrasea/TaskManager/Job/SubdefsJob.php
View File

@@ -60,39 +60,18 @@ class SubdefsJob extends AbstractJob
Image2Image::$lookForEmbeddedPreview = $thumbnailExtraction;
$sqlqmark = array();
$sqlparms = array();
foreach(array('image',
'video',
'audio',
'document',
'flash',
'unknown') as $type) {
if (!isset($settings->{"type_" . $type}) || !\p4field::isno($settings->{"type_" . $type})) {
$sqlqmark[] = '?';
$sqlparms[] = $type;
}
}
foreach ($app['phraseanet.appbox']->get_databoxes() as $databox) {
if (!$this->isStarted()) {
break;
}
if(count($settings->xpath("sbas[text()=".$databox->get_sbas_id() ."]")) == 0) {
continue;
}
$conn = $databox->get_connection();
$sql = 'SELECT coll_id, record_id FROM record'
. ' WHERE jeton & ' . PhraseaTokens::MAKE_SUBDEF . ' > 0';
if(count($sqlqmark) > 0) {
$sql .= ' AND type IN(' . implode(',', $sqlqmark) . ')';
}
$sql .= ' ORDER BY record_id DESC LIMIT 0, 30';
$sql = 'SELECT coll_id, record_id
FROM record
WHERE jeton & ' . PhraseaTokens::MAKE_SUBDEF . ' > 0
ORDER BY record_id DESC LIMIT 0, 30';
$stmt = $conn->prepare($sql);
$stmt->execute($sqlparms);
$stmt->execute();
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -110,19 +89,19 @@ class SubdefsJob extends AbstractJob
$this->log('warning', sprintf("Generate subdefs failed for : sbasid=%s / databox=%s / recordid=%s : %s", $databox->get_sbas_id(), $databox->get_dbname() , $row['record_id'], $e->getMessage()));
}
$sql = 'UPDATE record'
. ' SET jeton=(jeton & ~' . PhraseaTokens::MAKE_SUBDEF . '), moddate=NOW()'
. ' WHERE record_id=:record_id';
$sql = 'UPDATE record
SET jeton=(jeton & ~' . PhraseaTokens::MAKE_SUBDEF . '), moddate=NOW()
WHERE record_id=:record_id';
$stmt = $conn->prepare($sql);
$stmt->execute([':record_id' => $row['record_id']]);
$stmt->closeCursor();
// rewrite metadata
$sql = 'UPDATE record'
. ' SET status=(status & ~0x03),'
. ' jeton=(jeton | ' . PhraseaTokens::WRITE_META_SUBDEF . ')'
. ' WHERE record_id=:record_id';
$sql = 'UPDATE record
SET status=(status & ~0x03),
jeton=(jeton | ' . PhraseaTokens::WRITE_META_SUBDEF . ')
WHERE record_id=:record_id';
$stmt = $conn->prepare($sql);
$stmt->execute([':record_id' => $row['record_id']]);
$stmt->closeCursor();
@@ -138,5 +117,4 @@ class SubdefsJob extends AbstractJob
$app['elasticsearch.indexer']->flushQueue();
}
}