- optimization : representative picture becomes mandatory for a non empty

  category. So, at each insertion in images table for a category, a new
  representative element is elected (by rand). This must be improved by not
  reelcting a random picture admin set an element as representative
  manually.

- optimization : recent cats page only needs 2 queries instead of 3*N (N
  categories to display). The bad point is that it shows representative
  element of recent cat and not a random element among recently added.

- optimization : empty cats page only needs 1 query per non empty sub
  category instead of... a lot. For each sub category, PhpWebGallery shows
  the representative element of a category chosen randomly in sub
  cats. Thus, get_non_empty_subcat_ids and get_first_non_empty_cat_id
  becomes obsolete.

- new function get_cat_display_name_cache to show category names with a
  caching for all gallery categories names. This function, to the contrary
  of get_cat_display_name shows names in the correct order...


git-svn-id: http://piwigo.org/svn/trunk@610 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 34 insertions, 42 deletions

diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 6fe0eece7..7e6d080d8 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -31,18 +31,30 @@
  * 
  */
 
-$subcats = array();
-if (isset($page['cat']))
+$query = '
+SELECT id, name, date_last
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id_uppercat ';
+if (!isset($page['cat']) or !is_numeric($page['cat']))
 {
-  $subcats = get_non_empty_subcat_ids($page['cat']);
+  $query.= 'is NULL';
 }
 else
 {
-  $subcats = get_non_empty_subcat_ids('');
+  $query.= '= '.$page['cat'];
+}
+// we must not show pictures of a forbidden category
+if ($user['forbidden_categories'] != '')
+{
+  $query.= ' AND id NOT IN ('.$user['forbidden_categories'].')';
 }
+$query.= '
+  ORDER BY rank
+;';
+$result = pwg_query($query);
 
 // template thumbnail initialization
-if (count($subcats) > 0)
+if (mysql_num_rows($result) > 0)
 {
   $template->assign_block_vars('thumbnails', array());
   // first line
@@ -51,58 +63,38 @@ if (count($subcats) > 0)
   $row_number = 0;
 }
 
-foreach ($subcats as $subcat_id => $non_empty_id) 
+while ($row = mysql_fetch_array($result))
 {
-  $name = $page['plain_structure'][$subcat_id]['name'];
-
-  // searching the representative picture of the category
   $query = '
-SELECT representative_picture_id
-  FROM '.CATEGORIES_TABLE.'
-  WHERE id = '.$non_empty_id.'
+SELECT path, tn_ext
+  FROM '.CATEGORIES_TABLE.' AS c INNER JOIN '.IMAGES_TABLE.' AS i
+    ON i.id = c.representative_picture_id
+  WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'
+  ORDER BY RAND()
+  LIMIT 0,1
 ;';
-  $row = mysql_fetch_array(pwg_query($query));
-    
-  $query = '
-SELECT file,path,tn_ext
-  FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
-  WHERE category_id = '.$non_empty_id.'
-    AND id = image_id';
-  // if the category has a representative picture, this is its thumbnail
-  // that will be displayed !
-  if (isset($row['representative_picture_id']))
-  {   
-    $query.= '
-    AND id = '.$row['representative_picture_id'];
-  }
-  else
+  $element_result = pwg_query($query);
+  if (mysql_num_rows($element_result) == 0)
   {
-    $query.= '
-  ORDER BY RAND()
-  LIMIT 0,1';
+    continue;
   }
-  $query.= '
-;';
-  $image_result = pwg_query($query);
-  $image_row    = mysql_fetch_array($image_result);
+  $element_row = mysql_fetch_array($element_result);
 
-  $thumbnail_link = get_thumbnail_src($image_row['path'],
-                                      @$image_row['tn_ext']);
+  $thumbnail_link = get_thumbnail_src($element_row['path'],
+                                      @$element_row['tn_ext']);
 
   $thumbnail_title = $lang['hint_category'];
 
-  $url_link = PHPWG_ROOT_PATH.'category.php?cat='.$subcat_id;
-
-  $date = $page['plain_structure'][$subcat_id]['date_last'];
+  $url_link = PHPWG_ROOT_PATH.'category.php?cat='.$row['id'];
 
   $template->assign_block_vars(
     'thumbnails.line.thumbnail',
     array(
       'IMAGE'                 => $thumbnail_link,
-      'IMAGE_ALT'             => $image_row['file'],
+      'IMAGE_ALT'             => $row['name'],
       'IMAGE_TITLE'           => $thumbnail_title,
-      'IMAGE_NAME'            => '['.$name.']',
-      'IMAGE_TS'              => get_icon($date),
+      'IMAGE_NAME'            => '['.$row['name'].']',
+      'IMAGE_TS'              => get_icon(@$row['date_last']),
       'IMAGE_STYLE'           => 'thumb_category',
         
       'U_IMG_LINK'            => add_session_id($url_link)