Changeset 2309 for trunk

Timestamp:

Apr 26, 2008, 1:38:04 AM (17 years ago)

Author:

rvelices

Message:

• less mysql queries on picture page (under some circumstances)

Location:

trunk

Files:

• include/picture_rate.inc.php (modified) (2 diffs)
• picture.php (modified) (3 diffs)

trunk/include/picture_rate.inc.php

@@ -29 +29 @@
 if ($conf['rate'])
 {
-  $query = '
+  if ( NULL != $picture['current']['average_rate'] )
+  {
+    $query = '
 SELECT COUNT(rate) AS count
      , ROUND(AVG(rate),2) AS average
@@ -36 +38 @@
   WHERE element_id = '.$picture['current']['id'].'
 ;';
-  $row = mysql_fetch_array(pwg_query($query));
+    $row = mysql_fetch_array(pwg_query($query));
+  }
+  else
+  { // avg rate null -> no rate -> no need to query db
+    $row = array( 'count'=>0, 'average'=>NULL, 'std'=>NULL );
+  }
   $template->assign('rate_summary', $row);
 

trunk/picture.php

@@ -613 +613 @@
 
     'LEVEL_SEPARATOR' => $conf['level_separator'],
-    
+
     'FILE_PICTURE_NAV_BUTTONS' => 'picture_nav_buttons.tpl',
 
@@ -638 +638 @@
       );
   }
-  
+
   $template->assign(
     array(
@@ -816 +816 @@
 
 // related categories
-foreach ($related_categories as $category)
-{
+if ( count($related_categories)==1 and
+    isset($page['category']) and
+    $related_categories[0]['category_id']==$page['category']['id'] )
+{ // no need to go to db, we have all the info
   $template->append(
-    'related_categories',
-      count($related_categories) > 3
-        ? get_cat_display_name_cache($category['uppercats'])
-        : get_cat_display_name_from_id($category['category_id'])
-    );
+      'related_categories',
+      get_cat_display_name( $page['category']['upper_names'] )
+    );
+}
+else
+{ // use only 1 sql query to get names for all related categories
+  $ids = array();
+  foreach ($related_categories as $category)
+  {// add all uppercats to $ids
+    $ids = array_merge($ids, explode(',', $category['uppercats']) );
+  }
+  $ids = array_unique($ids);
+  $query = '
+SELECT id, name, permalink
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id IN ('.implode(',',$ids).')';
+  $cat_map = hash_from_query($query, 'id');
+  foreach ($related_categories as $category)
+  {
+    $cats = array();
+    foreach ( explode(',', $category['uppercats']) as $id )
+    {
+      $cats[] = $cat_map[$id];
+    }
+    $template->append('related_categories', get_cat_display_name($cats) );
+  }
 }