Changeset 2307

Timestamp:

Apr 21, 2008, 12:25:40 AM (16 years ago)

Author:

rvelices

Message:

merge r 2306 from trunk to branch-1_7

• merged function ordering() with update_global_rank() and also optimized the queries

Location:

branches/branch-1_7

Files:

• admin/cat_list.php (modified) (3 diffs)
• admin/include/functions.php (modified) (4 diffs)
• admin/maintenance.php (modified) (1 diff)
• admin/site_update.php (modified) (6 diffs)
• install/upgrade_1.3.1.php (modified) (11 diffs)

branches/branch-1_7/admin/cat_list.php

@@ -61 +61 @@
   mass_updates(CATEGORIES_TABLE, $fields, $datas);
 
-  update_global_rank(@$_GET['parent_id']);
+  update_global_rank();
 }
 
@@ -83 +83 @@
   delete_categories(array($_GET['delete']));
   array_push($page['infos'], l10n('cat_virtual_deleted'));
-  ordering();
   update_global_rank();
 }
@@ -295 +294 @@
 }
 // Add a link to Page bottom only if needed (10 or more categories)
-if ( isset($category['rank']) and $category['rank'] > 9 ) 
+if ( isset($category['rank']) and $category['rank'] > 9 )
 {
   $template->assign_block_vars('eop_link', array('ICON'=>'Displayed'));

branches/branch-1_7/admin/include/functions.php

@@ -684 +684 @@
 
 /**
- * updates the global_rank of categories under the given id_uppercat
- *
- * @param int id_uppercat
+ * order categories (update categories.rank and global_rank database fields)
+ * so that rank field are consecutive integers starting at 1 for each child
  * @return void
  */
-function update_global_rank($id_uppercat = 'all')
-{
-  $query = '
-SELECT id,rank
+function update_global_rank()
+{
+  $query = '
+SELECT id, if(id_uppercat is null,\'\',id_uppercat) AS id_uppercat, uppercats, rank, global_rank
   FROM '.CATEGORIES_TABLE.'
-;';
-  $result = pwg_query($query);
-  $ranks_array = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    $ranks_array[$row['id']] = $row['rank'];
-  }
-
-  // which categories to update ?
-  $uppercats_array = array();
-
-  $query = '
-SELECT id,uppercats
-  FROM '.CATEGORIES_TABLE;
-  if (is_numeric($id_uppercat))
-  {
-    $query.= '
-  WHERE uppercats REGEXP \'(^|,)'.$id_uppercat.'(,|$)\'
-    AND id != '.$id_uppercat.'
-';
-  }
-  $query.= '
-;';
+  ORDER BY id_uppercat,rank,name
+;';
+
+  $cat_map = array();
+
+  $current_rank = 0;
+  $current_uppercat = '';
+
   $result = pwg_query($query);
   while ($row = mysql_fetch_array($result))
   {
-    $uppercats_array[$row['id']] =  $row['uppercats'];
+    if ($row['id_uppercat'] != $current_uppercat)
+    {
+      $current_rank = 0;
+      $current_uppercat = $row['id_uppercat'];
+    }
+    ++$current_rank;
+    $cat =
+      array(
+        'rank' =>        $current_rank,
+        'rank_changed' =>$current_rank!=$row['rank'],
+        'global_rank' => $row['global_rank'],
+        'uppercats' =>   $row['uppercats'],
+        );
+    $cat_map[ $row['id'] ] = $cat;
   }
 
   $datas = array();
-  foreach ($uppercats_array as $id => $uppercats)
-  {
-    array_push(
-      $datas,
-      array(
-        'id'          => $id,
-        'global_rank' => preg_replace(
+
+  foreach( $cat_map as $id=>$cat )
+  {
+    $new_global_rank = preg_replace(
           '/(\d+)/e',
-          "\$ranks_array['$1']",
-          str_replace(',', '.', $uppercats)
-          ),
-        )
-      );
+          "\$cat_map['$1']['rank']",
+          str_replace(',', '.', $cat['uppercats'] )
+          );
+    if ( $cat['rank_changed']
+      or $new_global_rank!=$cat['global_rank']
+      )
+    {
+      $datas[] = array(
+          'id' => $id,
+          'rank' => $cat['rank'],
+          'global_rank' => $new_global_rank,
+        );
+    }
   }
 
@@ -743 +745 @@
     array(
       'primary' => array('id'),
-      'update'  => array('global_rank')
+      'update'  => array('rank', 'global_rank')
       ),
     $datas
     );
+  return count($datas);
 }
 
@@ -892 +895 @@
     $datas
     );
-}
-
-/**
- * order categories (update categories.rank and global_rank database fields)
- *
- * the purpose of this function is to give a rank for all categories
- * (insides its sub-category), even the newer that have none at te
- * beginning. For this, ordering function selects all categories ordered by
- * rank ASC then name ASC for each uppercat.
- *
- * @returns void
- */
-function ordering()
-{
-  $current_rank = 0;
-  $current_uppercat = '';
-
-  $query = '
-SELECT id, if(id_uppercat is null,\'\',id_uppercat) AS id_uppercat
-  FROM '.CATEGORIES_TABLE.'
-  ORDER BY id_uppercat,rank,name
-;';
-  $result = pwg_query($query);
-  $datas = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    if ($row['id_uppercat'] != $current_uppercat)
-    {
-      $current_rank = 0;
-      $current_uppercat = $row['id_uppercat'];
-    }
-    $data = array('id' => $row['id'], 'rank' => ++$current_rank);
-    array_push($datas, $data);
-  }
-
-  $fields = array('primary' => array('id'), 'update' => array('rank'));
-  mass_updates(CATEGORIES_TABLE, $fields, $datas);
 }
 
@@ -1371 +1337 @@
 
   update_uppercats();
-  ordering();
   update_global_rank();
 

branches/branch-1_7/admin/maintenance.php

@@ -49 +49 @@
     update_uppercats();
     update_category('all');
-    ordering();
     update_global_rank();
     invalidate_user_cache();

branches/branch-1_7/admin/site_update.php

@@ -243 +243 @@
   // If $_POST['subcats-included'] != 1 ("Search in subcategories" is unchecked)
   // $db_fulldirs doesn't include any subdirectories and $fs_fulldirs does
-  // So $fs_fulldirs will be limited to the selected basedir 
+  // So $fs_fulldirs will be limited to the selected basedir
   // (if that one is in $fs_fulldirs)
   if (!isset($_POST['subcats-included']) or $_POST['subcats-included'] != 1)
@@ -254 +254 @@
   // die('That\'s why dirs or files synchronizations were duplicating cats.');
 
-  $inserts = array();  
+  $inserts = array();
   // new categories are the directories not present yet in the database
   foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
@@ -671 +671 @@
     echo ' -->'."\n";
     $start = get_moment();
-    ordering();
     update_global_rank();
     echo '<!-- ordering categories : ';
@@ -829 +828 @@
     }
   }
-  
+
   foreach ( $files as $id=>$file )
   {
@@ -836 +835 @@
       in_array($id, $has_high_images)
       );
-    
+
     if ( is_array($data) )
     {
@@ -873 +872 @@
     {
       // echo '<pre>', print_r($datas); echo '</pre>';
-      
+
       mass_updates(
         IMAGES_TABLE,

branches/branch-1_7/install/upgrade_1.3.1.php

@@ -72 +72 @@
   ADD COLUMN commentable enum('true','false') NOT NULL default 'true'
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_categories
@@ -92 +92 @@
   SET date_temp = date
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_comments
@@ -127 +127 @@
   SET date_temp = date
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_history
@@ -208 +208 @@
   ADD INDEX images_i5 (date_creation)
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sessions
@@ -223 +223 @@
   SET expiration_temp = expiration
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sessions
@@ -238 +238 @@
   DROP COLUMN expiration_temp
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sites
@@ -252 +252 @@
 DROP TABLE phpwebgallery_user_category
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_users
@@ -277 +277 @@
   ADD UNIQUE users_ui1 (username)
 ;",
-  
+
   "
 CREATE TABLE phpwebgallery_rate (
@@ -343 +343 @@
 {
   $existing_indexes = array();
-  
+
   $query = '
 SHOW INDEX
@@ -530 +530 @@
 
 // refresh calculated datas
-ordering();
 update_global_rank();
 update_category();
@@ -588 +587 @@
   array(
     'all sub-categories of private categories become private',
-    
+
     'user permissions and group permissions have been erased',