From bdd64d50ee620c2728afd463a1076eccdb3dccb0 Mon Sep 17 00:00:00 2001 From: xmujay Date: Mon, 2 Sep 2013 20:09:46 +0800 Subject: [PATCH] add function for render Space Usage --- libraries/tbl_printview.lib.php | 140 ++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 51 deletions(-) diff --git a/libraries/tbl_printview.lib.php b/libraries/tbl_printview.lib.php index fd55594b2d..d21895e94e 100644 --- a/libraries/tbl_printview.lib.php +++ b/libraries/tbl_printview.lib.php @@ -57,8 +57,8 @@ function PMA_getHtmlForPrintViewFooter() * @param array $pk_array primary key array * @param bool $have_rel have relation? * @param array $res_rel relations array - * @param string $db database - * @param string $table table + * @param string $db database name + * @param string $table table name * @param array $cfgRelation config from PMA_getRelationsParam * * @return string @@ -270,6 +270,79 @@ function PMA_getHtmlForRowStatistics( return $html; } +/** + * return html for Space Usage + * + * @param int $data_size data size + * @param int $data_unit data unit + * @param int $index_size index size + * @param int $index_unit index unit + * @param int $free_size free size + * @param int $free_unit free unit + * @param int $effect_size effect size + * @param int $effect_unit effect unit + * @param int $tot_size total size + * @param int $tot_unit total unit + * @param bool $mergetable is merge table? + * + * @return string + */ +function PMA_getHtmlForSpaceUsage( + $data_size, $data_unit, $index_size, $index_unit, + $free_size, $free_unit, $effect_size, $effect_unit, + $tot_size, $tot_unit, $mergetable +) { + $html = ''; + $html .= "\n"; + $html .= ''; + + // Space usage + $html .= '
'; + $html .= '' . __('Space usage:') . ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + if (isset($index_size)) { + $html .= "\n"; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + } + if (isset($free_size)) { + $html .= "\n"; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + } + if (isset($tot_size) && $mergetable == false) { + $html .= "\n"; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + } + $html .= "\n"; + $html .= '
' . __('Data') . '' . $data_size . '' . $data_unit . '
' . __('Index') . '' . $index_size . '' . $index_unit. '
'; + $html .= __('Overhead'); + $html .= '' . $free_size . '' . $free_unit . '
'; + $html .= __('Effective'); + $html .= '' . $effect_size . '' . $effect_unit . '
' . __('Total') . '' . $tot_size . '' . $tot_unit . '
'; + + return $html; +} /** * return html for Space Usage And Row Statistic * @@ -338,55 +411,19 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics( // Displays them $html .= '

'; + $html .= PMA_getHtmlForSpaceUsage( + $data_size, $data_unit, + isset($index_size)? $index_size : null, + isset($index_unit)? $index_unit : null, + isset($free_size)? $free_size : null, + isset($free_unit)? $free_unit : null, + isset($effect_size)? $effect_size : null, + isset($effect_unit)? $effect_unit : null, + isset($tot_size)? $tot_size : null, + isset($tot_unit)? $tot_unit : null, + $mergetable + ); - $html .= ''; - $html .= "\n"; - $html .= ''; - - // Space usage - $html .= ''; $html .= PMA_getHtmlForRowStatistics( $showtable, $cell_align_left, @@ -403,6 +440,7 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics( return $html; } + /** * return html for Table Structure * @@ -447,7 +485,7 @@ function PMA_getHtmlForTableStructure( $html .= ''; $html .= ''; $html .= PMA_getHtmlForPrintViewColumns( - $columns, $analyzed_sql, $pk_array, $have_rel, + $columns, $analyzed_sql, $pk_array, $have_rel, $res_rel, $db, $table, $cfgRelation ); $html .= '';
'; - $html .= '' . __('Space usage:') . ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - if (isset($index_size)) { - $html .= "\n"; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - } - if (isset($free_size)) { - $html .= "\n"; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - } - if (isset($tot_size) && $mergetable == false) { - $html .= "\n"; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - } - $html .= "\n"; - $html .= '
' . __('Data') . '' . $data_size . '' . $data_unit . '
' . __('Index') . '' . $index_size . '' . $index_unit. '
'; - $html .= __('Overhead'); - $html .= '' . $free_size . '' . $free_unit . '
'; - $html .= __('Effective'); - $html .= '' . $effect_size . '' . $effect_unit . '
' . __('Total') . '' . $tot_size . '' . $tot_unit . '
'; $html .= '