Changeset 2324 for trunk/include

Timestamp:

May 1, 2008, 3:12:34 AM (16 years ago)

Author:

rvelices

Message:

• move #categories.date_last and nb_images to #user_cache_categories

Location:

trunk/include

Files:

• functions_filter.inc.php (modified) (1 diff)
• functions_user.inc.php (modified) (6 diffs)

trunk/include/functions_filter.inc.php

@@ -49 +49 @@
   if ($filter['enabled'])
   {
-    $upd_fields = array('max_date_last', 'count_images', 'count_categories', 'nb_images');
+    $upd_fields = array('date_last', 'max_date_last', 'count_images', 'count_categories', 'nb_images');
 
     foreach ($cats as $cat_id => $category)

trunk/include/functions_user.inc.php

@@ -583 +583 @@
 function get_computed_categories($userdata, $filter_days=null)
 {
-  $group_by = '';
-
   $query = 'SELECT c.id cat_id, global_rank';
   // Count by date_available to avoid count null
   $query .= ',
-  MAX(date_available) cat_date_last,  COUNT(date_available) cat_nb_images
+  MAX(date_available) date_last, COUNT(date_available) nb_images
 FROM '.CATEGORIES_TABLE.' as c
   LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id
@@ -599 +597 @@
     $query .= ' AND i.date_available > SUBDATE(CURRENT_DATE,INTERVAL '.$filter_days.' DAY)';
   }
-  $group_by = 'c.id';
 
   if ( !empty($userdata['forbidden_categories']) )
@@ -607 +604 @@
   }
 
-  if ( !empty($group_by) )
-  {
-    $query.= '
-  GROUP BY '.$group_by;
-  }
+  $query.= '
+  GROUP BY c.id';
 
   $result = pwg_query($query);
@@ -620 +614 @@
     $row['user_id'] = $userdata['id'];
     $row['count_categories'] = 0;
-    $row['count_images'] = $row['cat_nb_images'];
-    $row['max_date_last'] = $row['cat_date_last'];
+    $row['count_images'] = (int)$row['nb_images'];
+    $row['max_date_last'] = $row['date_last'];
 
     $cats += array($row['cat_id'] => $row);
@@ -640 +634 @@
         // Re-init counters
         $category['count_categories'] = 0;
-        $category['count_images'] = $category['cat_nb_images'];
-        // next line for update_cats_with_filtered_data
-        $category['nb_images'] = $category['cat_nb_images'];
+        $category['count_images'] = (int)$category['nb_images'];
         // Keep category
         $cats[$category['cat_id']] = $category;
@@ -677 +669 @@
     (
       'user_id', 'cat_id',
-      'max_date_last', 'count_images', 'count_categories'
+      'date_last', 'max_date_last', 'nb_images', 'count_images', 'count_categories'
     ),
     $cats