From 21b2c2731ef6ad1f9db039fb52060a34c94fdac4 Mon Sep 17 00:00:00 2001 From: soranzo Date: Fri, 26 Jan 2007 17:55:42 +0000 Subject: [PATCH] Incrementally use ->fields for recordsets, ->f is not supported by upstream adodb. --- domains.php | 48 +++++++++++++-------------- info.php | 94 ++++++++++++++++++++++++++--------------------------- reports.php | 34 +++++++++---------- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/domains.php b/domains.php index d114dd54..3fdf3fdd 100644 --- a/domains.php +++ b/domains.php @@ -3,7 +3,7 @@ /** * Manage domains in a database * - * $Id: domains.php,v 1.24 2006/06/18 00:02:48 xzilla Exp $ + * $Id: domains.php,v 1.25 2007/01/26 17:55:42 soranzo Exp $ */ // Include application functions @@ -45,20 +45,20 @@ if ($domaindata->recordCount() > 0) { if (!isset($_POST['domname'])) { - $_POST['domtype'] = $domaindata->f['domtype']; - $_POST['domdefault'] = $domaindata->f['domdef']; - $domaindata->f['domnotnull'] = $data->phpBool($domaindata->f['domnotnull']); - if ($domaindata->f['domnotnull']) $_POST['domnotnull'] = 'on'; - $_POST['domowner'] = $domaindata->f['domowner']; + $_POST['domtype'] = $domaindata->fields['domtype']; + $_POST['domdefault'] = $domaindata->fields['domdef']; + $domaindata->fields['domnotnull'] = $data->phpBool($domaindata->fields['domnotnull']); + if ($domaindata->fields['domnotnull']) $_POST['domnotnull'] = 'on'; + $_POST['domowner'] = $domaindata->fields['domowner']; } // Display domain info echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -67,7 +67,7 @@ echo "\n"; echo ""; + echo ""; echo ""; echo "\n"; + echo "href}&constraint=", urlencode($domaincons->fields['conname']), + "&domain=", urlencode($_REQUEST['domain']), "&type=", urlencode($domaincons->fields['contype']), "\">{$lang['strdrop']}\n"; $domaincons->moveNext(); $i++; @@ -306,9 +306,9 @@ // Output return type list echo "\n"; diff --git a/info.php b/info.php index 697b090e..d776d782 100644 --- a/info.php +++ b/info.php @@ -3,7 +3,7 @@ /** * List extra information on a table * - * $Id: info.php,v 1.12 2007/01/26 17:03:01 xzilla Exp $ + * $Id: info.php,v 1.13 2007/01/26 17:55:42 soranzo Exp $ */ // Include application functions @@ -64,14 +64,14 @@ $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n\t\t"; if ($data->hasSchemas()) { - echo ""; + echo ""; } - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; echo "\n"; + "&schema=", urlencode($referrers->fields['nspname']), + "&table=", urlencode($referrers->fields['relname']), "\">{$lang['strproperties']}\n"; echo "\t\n"; $referrers->movenext(); $i++; @@ -97,12 +97,12 @@ $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; if ($data->hasSchemas()) { - echo "\t\t"; + echo "\t\t"; } - echo ""; + echo ""; echo "\n"; + "&schema=", urlencode($parents->fields['nspname']), + "&table=", urlencode($parents->fields['relname']), "\">{$lang['strproperties']}\n"; echo "\t\n"; $parents->movenext(); $i++; @@ -128,12 +128,12 @@ $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; if ($data->hasSchemas()) { - echo "\t\t"; + echo "\t\t"; } - echo ""; + echo ""; echo "\n"; + "&schema=", urlencode($children->fields['schemaname']), + "&table=", urlencode($children->fields['relname']), "\">{$lang['strproperties']}\n"; echo "\t\n"; $children->movenext(); $i++; @@ -167,13 +167,13 @@ while (!$tablestatstups->EOF) { $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\n"; $tablestatstups->movenext(); $i++; @@ -213,32 +213,32 @@ $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; - $total = $tablestatsio->f['heap_blks_hit'] + $tablestatsio->f['heap_blks_read']; - if ($total > 0) $percentage = round(($tablestatsio->f['heap_blks_hit'] / $total) * 100); + $total = $tablestatsio->fields['heap_blks_hit'] + $tablestatsio->fields['heap_blks_read']; + if ($total > 0) $percentage = round(($tablestatsio->fields['heap_blks_hit'] / $total) * 100); else $percentage = 0; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\t\n"; - $total = $tablestatsio->f['idx_blks_hit'] + $tablestatsio->f['idx_blks_read']; - if ($total > 0) $percentage = round(($tablestatsio->f['idx_blks_hit'] / $total) * 100); + $total = $tablestatsio->fields['idx_blks_hit'] + $tablestatsio->fields['idx_blks_read']; + if ($total > 0) $percentage = round(($tablestatsio->fields['idx_blks_hit'] / $total) * 100); else $percentage = 0; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\t\n"; - $total = $tablestatsio->f['toast_blks_hit'] + $tablestatsio->f['toast_blks_read']; - if ($total > 0) $percentage = round(($tablestatsio->f['toast_blks_hit'] / $total) * 100); + $total = $tablestatsio->fields['toast_blks_hit'] + $tablestatsio->fields['toast_blks_read']; + if ($total > 0) $percentage = round(($tablestatsio->fields['toast_blks_hit'] / $total) * 100); else $percentage = 0; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\t\n"; - $total = $tablestatsio->f['tidx_blks_hit'] + $tablestatsio->f['tidx_blks_read']; - if ($total > 0) $percentage = round(($tablestatsio->f['tidx_blks_hit'] / $total) * 100); + $total = $tablestatsio->fields['tidx_blks_hit'] + $tablestatsio->fields['tidx_blks_read']; + if ($total > 0) $percentage = round(($tablestatsio->fields['tidx_blks_hit'] / $total) * 100); else $percentage = 0; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\t\n"; echo "\t\n"; $tablestatsio->movenext(); @@ -264,10 +264,10 @@ while (!$indexstatstups->EOF) { $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\n"; $indexstatstups->movenext(); $i++; @@ -292,12 +292,12 @@ while (!$indexstatsio->EOF) { $id = ( ($i % 2 ) == 0 ? '1' : '2' ); echo "\t\n"; - $total = $indexstatsio->f['idx_blks_hit'] + $indexstatsio->f['idx_blks_read']; - if ($total > 0) $percentage = round(($indexstatsio->f['idx_blks_hit'] / $total) * 100); + $total = $indexstatsio->fields['idx_blks_hit'] + $indexstatsio->fields['idx_blks_read']; + if ($total > 0) $percentage = round(($indexstatsio->fields['idx_blks_hit'] / $total) * 100); else $percentage = 0; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; echo "\t\t\n"; echo "\t\n"; $indexstatsio->movenext(); diff --git a/reports.php b/reports.php index 41096a90..9cf5b542 100644 --- a/reports.php +++ b/reports.php @@ -3,7 +3,7 @@ /** * List reports in a database * - * $Id: reports.php,v 1.23 2007/01/02 17:24:44 soranzo Exp $ + * $Id: reports.php,v 1.24 2007/01/26 17:55:42 soranzo Exp $ */ // Include application functions @@ -22,16 +22,16 @@ // If it's a first, load then get the data from the database $report = $reportsdb->getReport($_REQUEST['report_id']); if ($_REQUEST['action'] == 'edit') { - $_POST['report_name'] = $report->f['report_name']; - $_POST['db_name'] = $report->f['db_name']; - $_POST['descr'] = $report->f['descr']; - $_POST['report_sql'] = $report->f['report_sql']; + $_POST['report_name'] = $report->fields['report_name']; + $_POST['db_name'] = $report->fields['db_name']; + $_POST['descr'] = $report->fields['descr']; + $_POST['report_sql'] = $report->fields['report_sql']; } // Get a list of available databases $databases = $data->getDatabases(); - $_REQUEST['report'] = $report->f['report_name']; + $_REQUEST['report'] = $report->fields['report_name']; $misc->printTrail('report'); $misc->printTitle($lang['stredit']); $misc->printMsg($msg); @@ -45,7 +45,7 @@ echo "\n"; echo "\n"; echo "
{$lang['strname']}", $misc->printVal($domaindata->f['domname']), "
", $misc->printVal($domaindata->fields['domname']), "
{$lang['strtype']}", $misc->printVal($domaindata->f['domtype']), "
", $misc->printVal($domaindata->fields['domtype']), "
{$lang['strdefault']}
{$lang['strowner']}\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "
{$lang['strname']}", $misc->printVal($domaindata->f['domname']), "
", $misc->printVal($domaindata->fields['domname']), "
{$lang['strtype']}", $misc->printVal($domaindata->f['domtype']), "
", $misc->printVal($domaindata->fields['domtype']), "
{$lang['strnotnull']}", ($domaindata->f['domnotnull'] ? 'NOT NULL' : ''), "
", ($domaindata->fields['domnotnull'] ? 'NOT NULL' : ''), "
{$lang['strdefault']}", $misc->printVal($domaindata->f['domdef']), "
", $misc->printVal($domaindata->fields['domdef']), "
{$lang['strowner']}", $misc->printVal($domaindata->f['domowner']), "
", $misc->printVal($domaindata->fields['domowner']), "
\n"; // Display domain constraints @@ -214,13 +214,13 @@ while (!$domaincons->EOF) { $id = (($i % 2 ) == 0 ? '1' : '2'); - echo "
", $misc->printVal($domaincons->f['conname']), "
", $misc->printVal($domaincons->fields['conname']), ""; - echo $misc->printVal($domaincons->f['consrc']); + echo $misc->printVal($domaincons->fields['consrc']); echo ""; - echo "href}&constraint=", urlencode($domaincons->f['conname']), - "&domain=", urlencode($_REQUEST['domain']), "&type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}
", $misc->printVal($referrers->f['nspname']), "", $misc->printVal($referrers->fields['nspname']), "", $misc->printVal($referrers->f['relname']), "", $misc->printVal($referrers->f['conname']), "", $misc->printVal($referrers->f['consrc']), "", $misc->printVal($referrers->fields['relname']), "", $misc->printVal($referrers->fields['conname']), "", $misc->printVal($referrers->fields['consrc']), "href}", - "&schema=", urlencode($referrers->f['nspname']), - "&table=", urlencode($referrers->f['relname']), "\">{$lang['strproperties']}
", $misc->printVal($parents->f['nspname']), "", $misc->printVal($parents->fields['nspname']), "", $misc->printVal($parents->f['relname']), "", $misc->printVal($parents->fields['relname']), "href}", - "&schema=", urlencode($parents->f['nspname']), - "&table=", urlencode($parents->f['relname']), "\">{$lang['strproperties']}
", $misc->printVal($children->f['schemaname']), "", $misc->printVal($children->fields['schemaname']), "", $misc->printVal($children->f['relname']), "", $misc->printVal($children->fields['relname']), "href}", - "&schema=", urlencode($children->f['schemaname']), - "&table=", urlencode($children->f['relname']), "\">{$lang['strproperties']}
", $misc->printVal($tablestatstups->f['seq_scan'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['seq_tup_read'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['idx_scan'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['idx_tup_fetch'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['n_tup_ins'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['n_tup_upd'], 'int4', $shownull), "", $misc->printVal($tablestatstups->f['n_tup_del'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['seq_scan'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['seq_tup_read'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['idx_scan'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['idx_tup_fetch'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['n_tup_ins'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['n_tup_upd'], 'int4', $shownull), "", $misc->printVal($tablestatstups->fields['n_tup_del'], 'int4', $shownull), "
", $misc->printVal($tablestatsio->f['heap_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->f['heap_blks_hit'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['heap_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['heap_blks_hit'], 'int4', $shownull), "({$percentage}{$lang['strpercent']})", $misc->printVal($tablestatsio->f['idx_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->f['idx_blks_hit'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['idx_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['idx_blks_hit'], 'int4', $shownull), "({$percentage}{$lang['strpercent']})", $misc->printVal($tablestatsio->f['toast_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->f['toast_blks_hit'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['toast_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['toast_blks_hit'], 'int4', $shownull), "({$percentage}{$lang['strpercent']})", $misc->printVal($tablestatsio->f['tidx_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->f['tidx_blks_hit'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['tidx_blks_read'], 'int4', $shownull), "", $misc->printVal($tablestatsio->fields['tidx_blks_hit'], 'int4', $shownull), "({$percentage}{$lang['strpercent']})
", $misc->printVal($indexstatstups->f['indexrelname']), "", $misc->printVal($indexstatstups->f['idx_scan'], 'int4', $shownull), "", $misc->printVal($indexstatstups->f['idx_tup_read'], 'int4', $shownull), "", $misc->printVal($indexstatstups->f['idx_tup_fetch'], 'int4', $shownull), "", $misc->printVal($indexstatstups->fields['indexrelname']), "", $misc->printVal($indexstatstups->fields['idx_scan'], 'int4', $shownull), "", $misc->printVal($indexstatstups->fields['idx_tup_read'], 'int4', $shownull), "", $misc->printVal($indexstatstups->fields['idx_tup_fetch'], 'int4', $shownull), "
", $misc->printVal($indexstatsio->f['indexrelname']), "", $misc->printVal($indexstatsio->f['idx_blks_read'], 'int4', $shownull), "", $misc->printVal($indexstatsio->f['idx_blks_hit'], 'int4', $shownull), "", $misc->printVal($indexstatsio->fields['indexrelname']), "", $misc->printVal($indexstatsio->fields['idx_blks_read'], 'int4', $shownull), "", $misc->printVal($indexstatsio->fields['idx_blks_hit'], 'int4', $shownull), "({$percentage}{$lang['strpercent']})
{$lang['strdatabase']}\n"; echo "\n"; echo "

\n"; - echo "f['report_id']}\" />\n"; + echo "fields['report_id']}\" />\n"; echo "\n"; } @@ -99,7 +99,7 @@ $report = $reportsdb->getReport($_REQUEST['report_id']); - $_REQUEST['report'] = $report->f['report_name']; + $_REQUEST['report'] = $report->fields['report_name']; $misc->printTrail('report'); $misc->printTitle($lang['strproperties']); $misc->printMsg($msg); @@ -107,19 +107,19 @@ if ($report->recordCount() == 1) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "
{$lang['strname']}", $misc->printVal($report->f['report_name']), "
", $misc->printVal($report->fields['report_name']), "
{$lang['strdatabase']}", $misc->printVal($report->f['db_name']), "
", $misc->printVal($report->fields['db_name']), "
{$lang['strcomment']}", $misc->printVal($report->f['descr']), "
", $misc->printVal($report->fields['descr']), "
{$lang['strsql']}", $misc->printVal($report->f['report_sql']), "
", $misc->printVal($report->fields['report_sql']), "
\n"; } else echo "

{$lang['strinvalidparam']}

\n"; echo "

href}\">{$lang['strshowallreports']} |\n"; - echo "href}&report_id={$report->f['report_id']}\">{$lang['stredit']}

\n"; + echo "href}&report_id={$report->fields['report_id']}\">{$lang['stredit']}

\n"; } /** @@ -149,7 +149,7 @@ echo "
{$lang['strdatabase']}