summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Arthur <flowerysong00@yahoo.com>2011-04-02 15:43:38 -0400
committerPaul Arthur <flowerysong00@yahoo.com>2011-04-02 15:43:38 -0400
commit90786a8c85d4ce270bfaa9d4ae9b00c6db71dd46 (patch)
treec55bd3fa887daebd3b62010864432784f79bee6d /admin
parent30d3bfdb7f69c7b5702744f39739f1dd2e16e3ab (diff)
downloadampache-90786a8c85d4ce270bfaa9d4ae9b00c6db71dd46.tar.gz
ampache-90786a8c85d4ce270bfaa9d4ae9b00c6db71dd46.tar.bz2
ampache-90786a8c85d4ce270bfaa9d4ae9b00c6db71dd46.zip
Catalog work
Reduce the frequency of some expensive database operations when processing multiple catalogs. More debugging output. Remove unnecessary or unused parameters from function calls.
Diffstat (limited to 'admin')
-rw-r--r--admin/catalog.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/admin/catalog.php b/admin/catalog.php
index 1b086b2f..2dc42208 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -78,7 +78,7 @@ switch ($_REQUEST['action']) {
if (isset($_REQUEST['catalogs'])) {
foreach ($_REQUEST['catalogs'] as $catalog_id) {
$catalog = new Catalog($catalog_id);
- $catalog->verify_catalog($catalog_id);
+ $catalog->verify_catalog();
}
}
$url = Config::get('web_path') . '/admin/catalog.php';
@@ -100,12 +100,13 @@ switch ($_REQUEST['action']) {
/* This runs the clean/verify/add in that order */
foreach ($_REQUEST['catalogs'] as $catalog_id) {
$catalog = new Catalog($catalog_id);
- $catalog->clean_catalog($catalog_id);
+ $catalog->clean_catalog();
$catalog->count = 0;
- $catalog->verify_catalog($catalog_id);
+ $catalog->verify_catalog();
$catalog->count = 0;
- $catalog->add_to_catalog($catalog_id);
+ $catalog->add_to_catalog();
}
+ Catalog::optimize_tables();
$url = Config::get('web_path') . '/admin/catalog.php';
$title = _('Catalog Updated');
$body = '';
@@ -161,8 +162,9 @@ switch ($_REQUEST['action']) {
if (isset($_REQUEST['catalogs'])) {
foreach($_REQUEST['catalogs'] as $catalog_id) {
$catalog = new Catalog($catalog_id);
- $catalog->clean_catalog(0,1);
+ $catalog->clean_catalog();
} // end foreach catalogs
+ Catalog::optimize_tables();
}
$url = Config::get('web_path') . '/admin/catalog.php';