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

Shorten remaining flag constants and remove legacy ones

Browse Source
This commit is contained in:
Mathieu Darse
2015-02-18 19:04:10 +01:00
parent 733bdeb05d
commit 57f3e3dcf0
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Core/PhraseaTokens.php
View File

@@ -19,12 +19,4 @@ final class PhraseaTokens
const WRITE_META = 6; // Equivalent to WRITE_META_DOC | WRITE_META_SUBDEF const WRITE_META = 6; // Equivalent to WRITE_META_DOC | WRITE_META_SUBDEF
const TO_INDEX = 8; const TO_INDEX = 8;
const INDEXING = 16; const INDEXING = 16;
// TODO Replace usages of below constants
const TOKEN_MAKE_SUBDEF = 0x01;
const TOKEN_WRITE_META_DOC = 0x02;
const TOKEN_WRITE_META_SUBDEF = 0x04;
const TOKEN_WRITE_META = 0x06;
const TOKEN_INDEX = 0x08;
const TOKEN_INDEXING = 0x10;
} }

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

@@ -68,7 +68,7 @@ class SubdefsJob extends AbstractJob
$sql = 'SELECT coll_id, record_id $sql = 'SELECT coll_id, record_id
FROM record FROM record
WHERE jeton & ' . PhraseaTokens::TOKEN_MAKE_SUBDEF . ' > 0 WHERE jeton & ' . PhraseaTokens::MAKE_SUBDEF . ' > 0
ORDER BY record_id DESC LIMIT 0, 30'; ORDER BY record_id DESC LIMIT 0, 30';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -89,7 +89,7 @@ class SubdefsJob extends AbstractJob
} }
$sql = 'UPDATE record $sql = 'UPDATE record
SET jeton=(jeton & ~' . PhraseaTokens::TOKEN_MAKE_SUBDEF . '), moddate=NOW() SET jeton=(jeton & ~' . PhraseaTokens::MAKE_SUBDEF . '), moddate=NOW()
WHERE record_id=:record_id'; WHERE record_id=:record_id';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
@@ -99,7 +99,7 @@ class SubdefsJob extends AbstractJob
// rewrite metadata // rewrite metadata
$sql = 'UPDATE record $sql = 'UPDATE record
SET status=(status & ~0x03), SET status=(status & ~0x03),
jeton=(jeton | ' . PhraseaTokens::TOKEN_MAKE_SUBDEF . ') jeton=(jeton | ' . PhraseaTokens::MAKE_SUBDEF . ')
WHERE record_id=:record_id'; WHERE record_id=:record_id';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute([':record_id' => $row['record_id']]); $stmt->execute([':record_id' => $row['record_id']]);

8
lib/Alchemy/Phrasea/TaskManager/Job/WriteMetadataJob.php
View File

@@ -83,7 +83,7 @@ class WriteMetadataJob extends AbstractJob
} }
} }
$sql = 'SELECT record_id, coll_id, jeton FROM record WHERE (jeton & ' . PhraseaTokens::TOKEN_WRITE_META . ' > 0)'; $sql = 'SELECT record_id, coll_id, jeton FROM record WHERE (jeton & ' . PhraseaTokens::WRITE_META . ' > 0)';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -99,8 +99,8 @@ class WriteMetadataJob extends AbstractJob
$subdefs = []; $subdefs = [];
foreach ($record->get_subdefs() as $name => $subdef) { foreach ($record->get_subdefs() as $name => $subdef) {
$write_document = (($token & PhraseaTokens::TOKEN_WRITE_META_DOC) && $name == 'document'); $write_document = (($token & PhraseaTokens::WRITE_META_DOC) && $name == 'document');
$write_subdef = (($token & PhraseaTokens::TOKEN_WRITE_META_SUBDEF) && isset($metaSubdefs[$name . '_' . $type])); $write_subdef = (($token & PhraseaTokens::WRITE_META_SUBDEF) && isset($metaSubdefs[$name . '_' . $type]));
if (($write_document || $write_subdef) && $subdef->is_physically_present()) { if (($write_document || $write_subdef) && $subdef->is_physically_present()) {
$subdefs[$name] = $subdef->get_pathfile(); $subdefs[$name] = $subdef->get_pathfile();
@@ -197,7 +197,7 @@ class WriteMetadataJob extends AbstractJob
} }
} }
$sql = 'UPDATE record SET jeton=jeton & ~' . PhraseaTokens::TOKEN_WRITE_META . ' WHERE record_id = :record_id'; $sql = 'UPDATE record SET jeton=jeton & ~' . PhraseaTokens::WRITE_META . ' WHERE record_id = :record_id';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute([':record_id' => $record_id]); $stmt->execute([':record_id' => $record_id]);
$stmt->closeCursor(); $stmt->closeCursor();

2
lib/classes/databox.php
View File

@@ -440,7 +440,7 @@ class databox extends base
$ret['thesaurus_indexed'] += $row['n']; $ret['thesaurus_indexed'] += $row['n'];
} }
$sql = "SELECT type, COUNT(record_id) AS n FROM record WHERE jeton & ".PhraseaTokens::TOKEN_MAKE_SUBDEF." GROUP BY type"; $sql = "SELECT type, COUNT(record_id) AS n FROM record WHERE jeton & ".PhraseaTokens::MAKE_SUBDEF." GROUP BY type";
$stmt = $this->get_connection()->prepare($sql); $stmt = $this->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);

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

@@ -1091,7 +1091,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
{ {
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id()); $databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$connbas = $databox->get_connection(); $connbas = $databox->get_connection();
$sql = 'UPDATE record SET jeton=(jeton | ' . PhraseaTokens::TOKEN_MAKE_SUBDEF . ') WHERE record_id = :record_id'; $sql = 'UPDATE record SET jeton=(jeton | ' . PhraseaTokens::MAKE_SUBDEF . ') WHERE record_id = :record_id';
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute([':record_id' => $this->get_record_id()]); $stmt->execute([':record_id' => $this->get_record_id()]);
$stmt->closeCursor(); $stmt->closeCursor();
@@ -1108,7 +1108,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
$databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id()); $databox = $this->app['phraseanet.appbox']->get_databox($this->get_sbas_id());
$connbas = $databox->get_connection(); $connbas = $databox->get_connection();
$sql = 'UPDATE record $sql = 'UPDATE record
SET jeton = jeton | (' . (PhraseaTokens::TOKEN_WRITE_META_DOC | PhraseaTokens::TOKEN_WRITE_META_SUBDEF) . ') SET jeton = jeton | (' . (PhraseaTokens::WRITE_META_DOC | PhraseaTokens::WRITE_META_SUBDEF) . ')
WHERE record_id= :record_id'; WHERE record_id= :record_id';
$stmt = $connbas->prepare($sql); $stmt = $connbas->prepare($sql);
$stmt->execute([':record_id' => $this->record_id]); $stmt->execute([':record_id' => $this->record_id]);