mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 03:39:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #972 use an alternative algorithm to discover number of future orphans, with very large albums

Browse source
This commit is contained in:
plegall 2019-01-28 14:05:36 +01:00
parent b8d6f01b38
commit b29ab344e9
1 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

41
admin/cat_modify.php
View file

@ -218,18 +218,49 @@ $category['nb_images_associated_outside'] = 0;
if ($category['nb_images_recursive'] > 0) if ($category['nb_images_recursive'] > 0)
{ {
$query = ' // if we don't have "too many" photos, it's faster to compute the orphans with MySQL
if ($category['nb_images_recursive'] < 30000)
{
$query = '
SELECT SELECT
DISTINCT(image_id) DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.' FROM '.IMAGE_CATEGORY_TABLE.'
WHERE category_id NOT IN ('.implode(',', $subcat_ids).') WHERE category_id NOT IN ('.implode(',', $subcat_ids).')
AND image_id IN ('.implode(',', $image_ids_recursive).') AND image_id IN ('.implode(',', $image_ids_recursive).')
;'; ;';
$image_ids_associated_outside = query2array($query, null, 'image_id');
$category['nb_images_associated_outside'] = count($image_ids_associated_outside);
$image_ids_becoming_orphan = array_diff($image_ids_recursive, $image_ids_associated_outside); $image_ids_associated_outside = query2array($query, null, 'image_id');
$category['nb_images_becoming_orphan'] = count($image_ids_becoming_orphan); $category['nb_images_associated_outside'] = count($image_ids_associated_outside);
$image_ids_becoming_orphan = array_diff($image_ids_recursive, $image_ids_associated_outside);
$category['nb_images_becoming_orphan'] = count($image_ids_becoming_orphan);
}
// else it's better to avoid sending a huge SQL request, we compute the orphan list with PHP
else
{
$image_ids_recursive_keys = array_flip($image_ids_recursive);
$query = '
SELECT
image_id
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE category_id NOT IN ('.implode(',', $subcat_ids).')
;';
$image_ids_associated_outside = query2array($query, null, 'image_id');
$image_ids_not_orphan = array();
foreach ($image_ids_associated_outside as $image_id)
{
if (isset($image_ids_recursive_keys[$image_id]))
{
$image_ids_not_orphan[] = $image_id;
}
}
$category['nb_images_associated_outside'] = count(array_unique($image_ids_not_orphan));
$image_ids_becoming_orphan = array_diff($image_ids_recursive, $image_ids_not_orphan);
$category['nb_images_becoming_orphan'] = count($image_ids_becoming_orphan);
}
} }
// Navigation path // Navigation path