james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce redundant database queries, re-use the pool array.

Browse Source
This commit is contained in:
green-ponies (jgen) 2012-02-08 16:51:10 -05:00
parent 050a9a17df
commit 7cfad30bb3
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pools/main.php
View File

@ -237,7 +237,6 @@ class Pools extends SimpleExtension {
$show_next = $config->get_bool("poolsShowNextLink", false); $show_next = $config->get_bool("poolsShowNextLink", false);
$linksPools = array(); $linksPools = array();
foreach($poolsIDs as $poolID) { foreach($poolsIDs as $poolID) {
$pools = $this->get_pool($poolID['pool_id']); $pools = $this->get_pool($poolID['pool_id']);
@ -246,7 +245,7 @@ class Pools extends SimpleExtension {
// Optionally show a link the Next image in the Pool. // Optionally show a link the Next image in the Pool.
if ($show_next) { if ($show_next) {
$next_image_in_pool = $this->get_next_post($pool['id'], $imageID); $next_image_in_pool = $this->get_next_post($pool, $imageID);
if (!empty($next_image_in_pool)) { if (!empty($next_image_in_pool)) {
$linksPools[] = '<a href="'.make_link('post/view/'.$next_image_in_pool).'" class="pools_next_img">Next</a>'; $linksPools[] = '<a href="'.make_link('post/view/'.$next_image_in_pool).'" class="pools_next_img">Next</a>';
} }
@ -491,12 +490,16 @@ class Pools extends SimpleExtension {
/** /**
* Gets the next successive image from a pool, given a pool ID and an image ID. * Gets the next successive image from a pool, given a pool ID and an image ID.
*
* @param $pool Array for the given pool
* @param $imageID Integer
* @retval Integer which is the next Image ID or NULL if none.
*/ */
private function get_next_post(/*int*/ $poolID, /*int*/ $imageID) { private function get_next_post(/*array*/ $pool, /*int*/ $imageID) {
global $database; global $database;
$poolID = int_escape($poolID); if (empty($pool) || empty($imageID))
$pool = $this->get_pool($poolID); return null;
$result = $database->get_one(" $result = $database->get_one("
SELECT image_id SELECT image_id
@ -504,7 +507,7 @@ class Pools extends SimpleExtension {
WHERE pool_id=:pid WHERE pool_id=:pid
AND image_order > (SELECT image_order FROM pool_images WHERE pool_id=:pid AND image_id =:iid LIMIT 1 ) AND image_order > (SELECT image_order FROM pool_images WHERE pool_id=:pid AND image_id =:iid LIMIT 1 )
ORDER BY image_order ASC LIMIT 1", ORDER BY image_order ASC LIMIT 1",
array("pid"=>$poolID, "iid"=>$imageID) ); array("pid"=>$pool['id'], "iid"=>$imageID) );
if (empty($result)) { if (empty($result)) {
// assume that we are at the end of the pool // assume that we are at the end of the pool