Incrementally use ->fields for recordsets, ->f is not supported by upstream adodb.

diff --git a/types.php b/types.php
index c25c58672f7a046267bf03e19af9fc27af612304..0b9867dcf9ce412d973ee728a257692e51616bfc 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.32 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: types.php,v 1.33 2007/01/23 14:12:29 soranzo Exp $
         */
 
        // Include application functions
@@ -29,11 +29,11 @@
                
                function attPre(&$rowdata) {
                        global $data;
-                       $rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
+                       $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
                }
                
                if ($typedata->recordCount() > 0) {
-                       switch ($typedata->f['typtype']) {
+                       switch ($typedata->fields['typtype']) {
                        case 'c':
                                $attrs = $data->getTableAttributes($_REQUEST['type']);
                                
@@ -59,20 +59,20 @@
                                break;
 
                        default:
-                               $byval = $data->phpBool($typedata->f['typbyval']);
+                               $byval = $data->phpBool($typedata->fields['typbyval']);
                                echo "<table>\n";
                                echo "<tr><th class=\"data left\">{$lang['strname']}</th>\n";
-                               echo "<td class=\"data1\">", $misc->printVal($typedata->f['typname']), "</td></tr>\n";
+                               echo "<td class=\"data1\">", $misc->printVal($typedata->fields['typname']), "</td></tr>\n";
                                echo "<tr><th class=\"data left\">{$lang['strinputfn']}</th>\n";
-                               echo "<td class=\"data1\">", $misc->printVal($typedata->f['typin']), "</td></tr>\n";
+                               echo "<td class=\"data1\">", $misc->printVal($typedata->fields['typin']), "</td></tr>\n";
                                echo "<tr><th class=\"data left\">{$lang['stroutputfn']}</th>\n";
-                               echo "<td class=\"data1\">", $misc->printVal($typedata->f['typout']), "</td></tr>\n";
+                               echo "<td class=\"data1\">", $misc->printVal($typedata->fields['typout']), "</td></tr>\n";
                                echo "<tr><th class=\"data left\">{$lang['strlength']}</th>\n";
-                               echo "<td class=\"data1\">", $misc->printVal($typedata->f['typlen']), "</td></tr>\n";
+                               echo "<td class=\"data1\">", $misc->printVal($typedata->fields['typlen']), "</td></tr>\n";
                                echo "<tr><th class=\"data left\">{$lang['strpassbyval']}</th>\n";
                                echo "<td class=\"data1\">", ($byval) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
                                echo "<tr><th class=\"data left\">{$lang['stralignment']}</th>\n";
-                               echo "<td class=\"data1\">", $misc->printVal($typedata->f['typalign']), "</td></tr>\n";
+                               echo "<td class=\"data1\">", $misc->printVal($typedata->fields['typalign']), "</td></tr>\n";
                                echo "</table>\n";
                        }
 
@@ -195,7 +195,7 @@
                                        echo "\t\t<td>\n\t\t\t<select name=\"type[{$i}]\">\n";
                                        $types->moveFirst();
                                        while (!$types->EOF) {
-                                               $typname = $types->f['typname'];
+                                               $typname = $types->fields['typname'];
                                                echo "\t\t\t\t<option value=\"", htmlspecialchars($typname), "\"",
                                                (isset($_REQUEST['type'][$i]) && $typname == $_REQUEST['type'][$i]) ? ' selected="selected"' : '', ">",
                                                        $misc->printVal($typname), "</option>\n";
@@ -297,7 +297,7 @@
                echo "<tr><th class=\"data left\">{$lang['strinputfn']}</th>\n";
                echo "<td class=\"data1\"><select name=\"typin\">";
                while (!$funcs->EOF) {
-                       $proname = htmlspecialchars($funcs->f['proname']);
+                       $proname = htmlspecialchars($funcs->fields['proname']);
                        echo "<option value=\"{$proname}\"",
                                ($proname == $_POST['typin']) ? ' selected="selected"' : '', ">{$proname}</option>\n";
                        $funcs->moveNext();
@@ -307,7 +307,7 @@
                echo "<td class=\"data1\"><select name=\"typout\">";
                $funcs->moveFirst();
                while (!$funcs->EOF) {
-                       $proname = htmlspecialchars($funcs->f['proname']);
+                       $proname = htmlspecialchars($funcs->fields['proname']);
                        echo "<option value=\"{$proname}\"",
                                ($proname == $_POST['typout']) ? ' selected="selected"' : '', ">{$proname}</option>\n";
                        $funcs->moveNext();
@@ -323,7 +323,7 @@
                echo "<td class=\"data1\"><select name=\"typelem\">";
                echo "<option value=\"\"></option>\n";
                while (!$types->EOF) {
-                       $currname = htmlspecialchars($types->f['typname']);
+                       $currname = htmlspecialchars($types->fields['typname']);
                        echo "<option value=\"{$currname}\"",
                                ($currname == $_POST['typelem']) ? ' selected="selected"' : '', ">{$currname}</option>\n";
                        $types->moveNext();
@@ -434,7 +434,7 @@
                        ),
                );
                
-               if (!isset($types->f['typtype'])) unset($columns['flavour']);
+               if (!isset($types->fields['typtype'])) unset($columns['flavour']);
 
                $actions = array(
                        'properties' => array(

diff --git a/viewproperties.php b/viewproperties.php
index 3109de91daec1773ea390e66c1fdfb9d42da557c..9c496f4e8261fc136130b7e187c8da3dca36140c 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.22 2007/01/02 17:24:44 soranzo Exp $
+        * $Id: viewproperties.php,v 1.23 2007/01/23 14:12:29 soranzo Exp $
         */
 
        // Include application functions
@@ -41,8 +41,8 @@
                if ($viewdata->recordCount() > 0) {
                        
                        if (!isset($_POST['formDefinition'])) {
-                               $_POST['formDefinition'] = $viewdata->f['vwdefinition'];
-                               $_POST['formComment'] = $viewdata->f['relcomment'];
+                               $_POST['formDefinition'] = $viewdata->fields['vwdefinition'];
+                               $_POST['formComment'] = $viewdata->fields['relcomment'];
                        }
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -141,12 +141,12 @@
                
                if ($vdata->recordCount() > 0) {
                        // Show comment if any
-                       if ($vdata->f['relcomment'] !== null)
-                               echo "<p class=\"comment\">", $misc->printVal($vdata->f['relcomment']), "</p>\n";
+                       if ($vdata->fields['relcomment'] !== null)
+                               echo "<p class=\"comment\">", $misc->printVal($vdata->fields['relcomment']), "</p>\n";
 
                        echo "<table width=\"100%\">\n";
                        echo "<tr><th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
-                       echo "<tr><td class=\"data1\">", $misc->printVal($vdata->f['vwdefinition']), "</td></tr>\n";
+                       echo "<tr><td class=\"data1\">", $misc->printVal($vdata->fields['vwdefinition']), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
@@ -182,9 +182,9 @@
                                $column = $data->getTableAttributes($_REQUEST['view'], $_REQUEST['column']);
 
                                if (!isset($_REQUEST['default'])) {
-                                       $_REQUEST['field'] = $column->f['attname'];
-                                       $_REQUEST['default'] = $_REQUEST['olddefault'] = $column->f['adsrc'];
-                                       $_REQUEST['comment'] = $column->f['comment'];
+                                       $_REQUEST['field'] = $column->fields['attname'];
+                                       $_REQUEST['default'] = $_REQUEST['olddefault'] = $column->fields['adsrc'];
+                                       $_REQUEST['comment'] = $column->fields['comment'];
                                }
 
                                // If name of view column is editable, make it a field
@@ -193,9 +193,9 @@
                                                htmlspecialchars($_REQUEST['field']), "\" /></td>";
                                }
                                else {
-                                       echo "<tr><td>", htmlspecialchars($column->f['attname']), "</td>";                                      
+                                       echo "<tr><td>", htmlspecialchars($column->fields['attname']), "</td>";                                 
                                }
-                               echo "<td>", $misc->printVal($data->formatType($column->f['type'], $column->f['atttypmod'])), "</td>";
+                               echo "<td>", $misc->printVal($data->formatType($column->fields['type'], $column->fields['atttypmod'])), "</td>";
                                echo "<td><input name=\"default\" size=\"20\" value=\"", 
                                        htmlspecialchars($_REQUEST['default']), "\" /></td>";
                                echo "<td><input name=\"comment\" size=\"32\" value=\"", 
@@ -292,7 +292,7 @@
                
                function attPre(&$rowdata) {
                        global $data;
-                       $rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
+                       $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
                }
                
                $misc->printTrail('view');
@@ -305,8 +305,8 @@
                $attrs = $data->getTableAttributes($_REQUEST['view']);          
 
                // Show comment if any
-               if ($vdata->f['relcomment'] !== null)
-                       echo "<p class=\"comment\">", $misc->printVal($vdata->f['relcomment']), "</p>\n";
+               if ($vdata->fields['relcomment'] !== null)
+                       echo "<p class=\"comment\">", $misc->printVal($vdata->fields['relcomment']), "</p>\n";
 
                $columns = array(
                        'column' => array(