From 900c508a56200823b21fab67cdb5373c56603212 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 22 May 2020 17:44:45 +0000 Subject: [PATCH] wip #3655 @6 --- inc/ws/Controlleur/class.ws.maintenance.php | 27 ++++++++++----------- inc/ws/Util/class.ws.links.php | 1 - 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 9aa50bdb1..64dc11c41 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -1737,19 +1737,22 @@ class wsMaintenance } } - public static function moveLinksToFiles() + public static function moveLinksToFiles($args) { CubeIT_Util_PHP::neverStop(); global $core; - $r = $core->con->select('SELECT * FROM books'); + $r = $core->con->select('SELECT * FROM books ORDER BY book_id DESC'); + + $k = (int)$args[0]; $books = []; while ($r->fetch()) { - $books[] = $r->book_id; + if ($r->book_id % 8 === $k) { + $books[] = $r->book_id; + } } - foreach ($books as $id) { $dir = WS_BOOKS . '/links/' . $id; if (!file_exists($dir)) { @@ -1760,9 +1763,10 @@ class wsMaintenance $updates = $dao->getLinksVersions($id); foreach ($updates as $time => $update) { - $file = $dir . '/' . $time . '.json.gz'; - $meta = $dir . '/' . $time . '.meta.json.gz'; - if (file_exists($file)) { + $file = $dir . '/' . $time . '.links'; + $gzfile = $file . '.gz'; + $meta = $dir . '/' . $time . '.meta'; + if (file_exists($file) || file_exists($gzfile)) { continue; } @@ -1772,13 +1776,8 @@ class wsMaintenance wsLinks::getLinksAndRulers($id, $links, $rulers, $time); $res = ['links' => $links, 'rulers' => $rulers]; - $gz = gzopen($file, 'ab'); - gzwrite($gz, json_encode($res)); - gzclose($gz); - - $gz = gzopen($meta, 'ab'); - gzwrite($gz, json_encode($update)); - gzclose($gz); + file_put_contents($file, json_encode($res)); + file_put_contents($meta, json_encode($update)); } } } diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php index e2d2650c2..efa47bf6f 100644 --- a/inc/ws/Util/class.ws.links.php +++ b/inc/ws/Util/class.ws.links.php @@ -208,7 +208,6 @@ class wsLinks public static function getLinksAndRulers($book_id, &$links, &$rulers, $time = null) { - global $core; $daoBook = new wsDAOBook($core->con); -- 2.39.5