From 8950ea40c6a6065bc17437818008324522fcaa09 Mon Sep 17 00:00:00 2001 From: chriskl Date: Tue, 20 Apr 2004 01:34:43 +0000 Subject: [PATCH] commit bryan encina's patch to extend admin functions (cluster, reindex, vacuum and analyze. with mods from me --- CREDITS | 2 +- HISTORY | 2 ++ database.php | 68 +++++++++++++++++++++++++++++++--------- lang/english.php | 7 ++++- lang/recoded/english.php | 7 ++++- 5 files changed, 69 insertions(+), 17 deletions(-) diff --git a/CREDITS b/CREDITS index 9297a07b..dabe1d20 100644 --- a/CREDITS +++ b/CREDITS @@ -42,6 +42,6 @@ Contributors - Mark Gibson (Pop-up SQL window) - Nicola Soranzo - Oliver Meyer & Sven Kiera (Table icons link to browse table) -- Bryan Encina (SQL window improvements, bug fixes) +- Bryan Encina (SQL window improvements, bug fixes, admin) - Dan Boren (Object comments) diff --git a/HISTORY b/HISTORY index 6673f5b5..a1dd808d 100644 --- a/HISTORY +++ b/HISTORY @@ -15,6 +15,8 @@ Features * Allow import of CSV, Tabbed and XML data. "Auto" mode chooses import mode based on the file extension. * Allow upload and execution of _basic_ SQL scripts +* More admin features available: vacuum, analyze, cluster all and reindex + (with all options) (Bryan Encina) Bugs * Fix pg_dump output for PostgreSQL 7.0.x and 7.1.x diff --git a/database.php b/database.php index a399c603..368b690f 100755 --- a/database.php +++ b/database.php @@ -3,7 +3,7 @@ /** * Manage schemas within a database * - * $Id: database.php,v 1.38 2004/04/12 06:30:55 chriskl Exp $ + * $Id: database.php,v 1.39 2004/04/20 01:34:43 chriskl Exp $ */ // Include application functions @@ -330,11 +330,10 @@ */ function doAdmin($action = '', $msg = '') { global $PHP_SELF, $data, $misc; - global $lang; - + global $lang; switch ($action) { - case 'vacuum': - $status = $data->vacuumDB(); + case 'vacuum': + $status = $data->vacuumDB('', isset($_REQUEST['vacuum_analyze']), isset($_REQUEST['vacuum_full']), isset($_REQUEST['vacuum_freeze']) ); if ($status == 0) doAdmin('', $lang['strvacuumgood']); else doAdmin('', $lang['strvacuumbad']); break; @@ -343,15 +342,56 @@ if ($status == 0) doAdmin('', $lang['stranalyzegood']); else doAdmin('', $lang['stranalyzebad']); break; + case 'cluster': + $status = $data->analyzeDB(); + if ($status == 0) doAdmin('', $lang['strclusteredgood']); + else doAdmin('', $lang['strclusterbad']); + break; + case 'reindex'; + $status = $data->analyzeDB(); + if ($status == 0) doAdmin('', $lang['strreindexgood']); + else doAdmin('', $lang['strreindexbad']); + break; default: $misc->printDatabaseNav(); echo "

", $misc->printVal($_REQUEST['database']), ": {$lang['stradmin']}

\n"; $misc->printMsg($msg); - echo "\n"; - + + // Vacuum + echo "
\n"; + echo "

{$lang['strvacuum']}

\n"; + echo "{$lang['stranalyze']}
\n"; + echo "{$lang['strfull']}
\n"; + echo "{$lang['strfreeze']}
\n"; + echo "\n"; + echo "\n"; + echo $misc->form; + echo "
\n"; + + // Analyze + echo "
\n"; + echo "

{$lang['stranalyze']}

\n"; + echo "\n"; + echo "\n"; + echo $misc->form; + echo "
\n"; + + // Cluster + echo "
\n"; + echo "

{$lang['strcluster']}

\n"; + echo "\n"; + echo "\n"; + echo $misc->form; + echo "
\n"; + + // Reindex + echo "
\n"; + echo "

{$lang['strreindex']}

\n"; + echo "{$lang['strforce']}
\n"; + echo "\n"; + echo "\n"; + echo $misc->form; + echo "
\n"; break; } } @@ -546,7 +586,7 @@ else { echo "

{$lang['strnoschemas']}

\n"; } - + echo "

{$lang['strcreateschema']}

\n"; } else { @@ -563,11 +603,11 @@ if (isset($_GET['term'])) doFind(false); else doFind(true); break; + case 'cluster': + case 'reindex': case 'analyze': - doAdmin('analyze'); - break; case 'vacuum': - doAdmin('vacuum'); + doAdmin($action); break; case 'admin': doAdmin(); diff --git a/lang/english.php b/lang/english.php index d70c0a8d..be9ce7a8 100755 --- a/lang/english.php +++ b/lang/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.138 2004/04/12 07:50:33 chriskl Exp $ + * $Id: english.php,v 1.139 2004/04/20 01:34:43 chriskl Exp $ */ // Language and character set @@ -277,6 +277,11 @@ $lang['strvacuumbad'] = 'Vacuum failed.'; $lang['stranalyzegood'] = 'Analyze complete.'; $lang['stranalyzebad'] = 'Analyze failed.'; + $lang['strreindexgood'] = 'Reindex complete.'; + $lang['strreindexbad'] = 'Reindex failed.'; + $lang['strfull'] = 'Full'; + $lang['strfreeze'] = 'Freeze'; + $lang['strforce'] = 'Force'; // Views $lang['strview'] = 'View'; diff --git a/lang/recoded/english.php b/lang/recoded/english.php index 907e96d7..68f585c0 100644 --- a/lang/recoded/english.php +++ b/lang/recoded/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.91 2004/04/12 07:50:43 chriskl Exp $ + * $Id: english.php,v 1.92 2004/04/20 01:34:43 chriskl Exp $ */ // Language and character set @@ -277,6 +277,11 @@ $lang['strvacuumbad'] = 'Vacuum failed.'; $lang['stranalyzegood'] = 'Analyze complete.'; $lang['stranalyzebad'] = 'Analyze failed.'; + $lang['strreindexgood'] = 'Reindex complete.'; + $lang['strreindexbad'] = 'Reindex failed.'; + $lang['strfull'] = 'Full'; + $lang['strfreeze'] = 'Freeze'; + $lang['strforce'] = 'Force'; // Views $lang['strview'] = 'View'; -- 2.39.5