Changeset 2303

Timestamp:

Apr 19, 2008, 4:59:18 AM (16 years ago)

Author:

rvelices

Message:

• removed some unused code
• mass_updates function does not need SELECT VERSION()
• rewrote update_uppercats to avoid db update if no change

File:

• branches/branch-1_7/admin/include/functions.php (modified) (6 diffs)

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

@@ -63 +63 @@
 function delete_categories($ids)
 {
-  global $counts;
-
   if (count($ids) == 0)
   {
@@ -125 +123 @@
   pwg_query($query);
 
-  if (isset($counts['del_categories']))
-  {
-    $counts['del_categories']+= count($ids);
-  }
   trigger_action('delete_categories', $ids);
 }
@@ -139 +133 @@
 function delete_elements($ids)
 {
-  global $counts;
-
   if (count($ids) == 0)
   {
@@ -202 +194 @@
   pwg_query($query);
 
-  if (isset($counts['del_elements']))
-  {
-    $counts['del_elements']+= count($ids);
-  }
   trigger_action('delete_elements', $ids);
 }
@@ -579 +567 @@
     // depending on the MySQL version, we use the multi table update or N
     // update queries
-    $query = 'SELECT VERSION() AS version;';
-    list($mysql_version) = mysql_fetch_array(pwg_query($query));
-    if (count($datas) < 10 or version_compare($mysql_version, '4.0.4') < 0)
+    if (count($datas) < 10 or version_compare(mysql_get_server_info(), '4.0.4') < 0)
     {
       // MySQL is prior to version 4.0.4, multi table update feature is not
@@ -1188 +1174 @@
 function update_uppercats()
 {
-  $uppercat_ids = array();
-
-  $query = '
-SELECT id, id_uppercat
+  $query = '
+SELECT id, id_uppercat, uppercats
   FROM '.CATEGORIES_TABLE.'
 ;';
-  $result = pwg_query($query);
-  while ($row = mysql_fetch_array($result))
-  {
-    $uppercat_ids[$row['id']] =
-      !empty($row['id_uppercat']) ? $row['id_uppercat'] : 'NULL';
-  }
-
-  // uppercats array associates a category id to the list of uppercats id.
-  $uppercats = array();
-
-  foreach (array_keys($uppercat_ids) as $id)
-  {
-    $uppercats[$id] = array();
+  $cat_map = hash_from_query($query, 'id');
+
+  $datas = array();
+  foreach ($cat_map as $id => $cat)
+  {
+    $upper_list = array();
 
     $uppercat = $id;
-
-    while ($uppercat != 'NULL')
-    {
-      array_push($uppercats[$id], $uppercat);
-      $uppercat = $uppercat_ids[$uppercat];
-    }
-  }
-
-  $datas = array();
-
-  foreach ($uppercats as $id => $list)
-  {
-    array_push(
-      $datas,
-      array(
-        'id' => $id,
-        'uppercats' => implode(',', array_reverse($list))
-        )
-      );
-  }
-
+    while ($uppercat)
+    {
+      array_push($upper_list, $uppercat);
+      $uppercat = $cat_map[$uppercat]['id_uppercat'];
+    }
+
+    $new_uppercats = implode(',', array_reverse($upper_list));
+    if ($new_uppercats != $cat['uppercats'])
+    {
+      array_push(
+        $datas,
+        array(
+          'id' => $id,
+          'uppercats' => $new_uppercats
+          )
+        );
+    }
+  }
   $fields = array('primary' => array('id'), 'update' => array('uppercats'));
   mass_updates(CATEGORIES_TABLE, $fields, $datas);