iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge 2043 from trunk to branch-1_7

Browse Source 
quick search results improvement: elements with the same relevance are ordered using the global order_by 

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2044 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-06-23 19:42:56 +00:00
parent 94a89e8f10
commit 134c91774f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/functions_search.inc.php
View File

@@ -417,6 +417,7 @@ SELECT image_id, COUNT(tag_id) AS q
{
// before returning the result "as is", make sure the user has the
// permissions for every item
global $conf;
$query = '
SELECT DISTINCT(id)
FROM '.IMAGES_TABLE.'
@@ -431,9 +432,16 @@ SELECT DISTINCT(id)
'visible_images' => 'id'
),
'AND'
);
$allowed_image_ids = array_from_query( $query, 'id');
$by_weights = array_intersect_key($by_weights, array_flip($allowed_image_ids));
).'
'.$conf['order_by'];
$allowed_images = array_flip( array_from_query( $query, 'id') );
$by_weights = array_intersect_key($by_weights, $allowed_images );
$divisor = 4.0 * count($allowed_images);
// decrease weight from 0 to 0.25 corresponding to the order
foreach ($allowed_images as $id=>$rank )
{
$by_weights[$id] -= $rank / $divisor;
}
$permissions_checked = true;
}
arsort($by_weights, SORT_NUMERIC);