allow select on views

diff --git a/HISTORY b/HISTORY
index 57bafdab18b8a45e0d911f69c926cb4a1bae5953..0e77c4786216132ba5db3c2bd451c4806a35d123 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,7 @@ Version 3.0.0-dev-4
 * Sort on a column when browsing a table
 * Slovak translation
 * Reload browser after create/drop of database, schemas and tables
+* Select on views
 
 Version 3.0.0-dev-3
 -------------------

diff --git a/views.php b/views.php
index 37551284b37f4ad630a4a3e1b4b5e55dc3fc224f..1a4aaa69934fcb06dbd11bdbe2edf86c4d8ee927 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.8 2003/04/04 03:59:36 chriskl Exp $
+        * $Id: views.php,v 1.9 2003/04/23 08:19:03 chriskl Exp $
         */
 
        // Include application functions
@@ -12,6 +12,89 @@
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
        if (!isset($msg)) $msg = '';
        $PHP_SELF = $_SERVER['PHP_SELF'];
+
+       /**
+        * Ask for select parameters and perform select
+        */
+       function doSelectRows($confirm, $msg = '') {
+               global $localData, $database, $misc;
+               global $lang;
+               global $PHP_SELF;
+
+               if ($confirm) {
+                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strviews']}: ", htmlspecialchars($_REQUEST['view']), ": {$lang['strselect']}</h2>\n";
+                       $misc->printMsg($msg);
+
+                       $attrs = &$localData->getTableAttributes($_REQUEST['view']);
+
+                       echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+                       if ($attrs->recordCount() > 0) {
+                               echo "<table>\n<tr>";
+
+                               // Output table header
+                               echo "<tr><th class=\"data\">{$lang['strshow']}</th><th class=\"data\">{$lang['strfield']}</th>";
+                               echo "<th class=\"data\">{$lang['strtype']}</th><th class=\"data\">{$lang['strnull']}</th>";
+                               echo "<th class=\"data\">{$lang['strvalue']}</th></tr>";
+
+                               $i = 0;
+                               while (!$attrs->EOF) {
+                                       $attrs->f['attnotnull'] = $localData->phpBool($attrs->f['attnotnull']);
+                                       // Set up default value if there isn't one already
+                                       if (!isset($_REQUEST['values'][$attrs->f['attname']]))
+                                               $_REQUEST['values'][$attrs->f['attname']] = null;
+                                       // Continue drawing row
+                                       $id = (($i % 2) == 0 ? '1' : '2');
+                                       echo "<tr>\n";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
+                                       echo "<input type=\"checkbox\" name=\"show[", htmlspecialchars($attrs->f['attname']), "]\"",
+                                               isset($_REQUEST['show'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", htmlspecialchars($attrs->f['attname']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">", htmlspecialchars($attrs->f['type']), "</td>";
+                                       echo "<td class=\"data{$id}\" nowrap=\"nowrap\">";
+                                       // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS)
+                                       if (!$attrs->f['attnotnull'])
+                                               echo "<input type=\"checkbox\" name=\"nulls[{$attrs->f['attname']}]\"",
+                                                       isset($_REQUEST['nulls'][$attrs->f['attname']]) ? ' checked="checked"' : '', " /></td>";
+                                       else
+                                               echo "&nbsp;</td>";
+                                       echo "<td class=\"data{$id}\" nowrap>", $localData->printField("values[{$attrs->f['attname']}]",
+                                               $_REQUEST['values'][$attrs->f['attname']], $attrs->f['type']), "</td>";
+                                       echo "</tr>\n";
+                                       $i++;
+                                       $attrs->moveNext();
+                               }
+                               echo "</table></p>\n";
+                       }
+                       else echo "<p>{$lang['strinvalidparam']}</p>\n";
+
+                       echo "<p><input type=\"hidden\" name=\"action\" value=\"selectrows\" />\n";
+                       echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\" />\n";
+                       echo $misc->form;
+                       echo "<input type=\"submit\" name=\"select\" value=\"{$lang['strselect']}\" />\n";
+                       echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
+                       echo "</form>\n";
+               }
+               else {
+                       if (!isset($_POST['show'])) $_POST['show'] = array();
+                       if (!isset($_POST['values'])) $_POST['values'] = array();
+                       if (!isset($_POST['nulls'])) $_POST['nulls'] = array();
+                       
+                       if (sizeof($_POST['show']) == 0)
+                               doSelectRows(true, $lang['strselectneedscol']);
+                       else {
+                               // Generate query SQL
+                               $query = $localData->getSelectSQL($_REQUEST['view'], array_keys($_POST['show']),
+                                       $_POST['values'], array_keys($_POST['nulls']));
+                               $_REQUEST['query'] = $query;
+                               $_REQUEST['return_url'] = "views.php?action=confselectrows&{$misc->href}&view={$_REQUEST['view']}";
+                               $_REQUEST['return_desc'] = $lang['strback'];
+
+                               include('display.php');
+                               exit;
+                       }
+               }
+
+}
        
        /** 
         * Function to save after editing a view
@@ -40,23 +123,23 @@
                
                if ($viewdata->recordCount() > 0) {
                        echo "<form action=\"$PHP_SELF\" method=post>\n";
-                       echo "<table width=100%>\n";
-                       echo "<tr><th class=data>{$lang['strname']}</th></tr>\n";
-                       echo "<tr><td class=data1>", htmlspecialchars($viewdata->f[$data->vwFields['vwname']]), "</td></tr>\n";
-                       echo "<tr><th class=data>{$lang['strdefinition']}</th></tr>\n";
-                       echo "<tr><td class=data1><textarea style=\"width:100%;\" rows=20 cols=50 name=formDefinition wrap=virtual>", 
+                       echo "<table width=\"100%\">\n";
+                       echo "<tr><th class=\"data>\"{$lang['strname']}</th></tr>\n";
+                       echo "<tr><td class=\"data1\">", htmlspecialchars($viewdata->f[$data->vwFields['vwname']]), "</td></tr>\n";
+                       echo "<tr><th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
+                       echo "<tr><td class=\"data1\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                                htmlspecialchars($viewdata->f[$data->vwFields['vwdef']]), "</textarea></td></tr>\n";
                        echo "</table>\n";
-                       echo "<input type=hidden name=action value=save_edit>\n";
-                       echo "<input type=hidden name=view value=\"", htmlspecialchars($_REQUEST['view']), "\">\n";
+                       echo "<input type=\"hidden\" name=\"action\" value=\"save_edit\">\n";
+                       echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\">\n";
                        echo $misc->form;
-                       echo "<input type=submit value=\"{$lang['strsave']}\"> <input type=reset value=\"{$lang['strreset']}\">\n";
+                       echo "<input type=\"submit\" value=\"{$lang['strsave']}\"> <input type=\"reset\" value=\"{$lang['strreset']}\">\n";
                        echo "</form>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=navlink href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a> |\n";
-               echo "<a class=navlink href=\"$PHP_SELF?action=properties&{$misc->href}&view=", 
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"$PHP_SELF?action=properties&{$misc->href}&view=", 
                        urlencode($_REQUEST['view']), "\">{$lang['strproperties']}</a></p>\n";
        }
        
@@ -73,17 +156,17 @@
                $viewdata = &$localData->getView($_REQUEST['view']);
                
                if ($viewdata->recordCount() > 0) {
-                       echo "<table width=100%>\n";
-                       echo "<tr><th class=data>{$lang['strname']}</th></tr>\n";
-                       echo "<tr><td class=data1>", htmlspecialchars($viewdata->f[$data->vwFields['vwname']]), "</td></tr>\n";
-                       echo "<tr><th class=data>{$lang['strdefinition']}</th></tr>\n";
-                       echo "<tr><td class=data1>", nl2br(htmlspecialchars($viewdata->f[$data->vwFields['vwdef']])), "</td></tr>\n";
+                       echo "<table width=\"100%\">\n";
+                       echo "<tr><th class=\"data\">{$lang['strname']}</th></tr>\n";
+                       echo "<tr><td class=\"data1\">", htmlspecialchars($viewdata->f[$data->vwFields['vwname']]), "</td></tr>\n";
+                       echo "<tr><th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
+                       echo "<tr><td class=\"data1\">", nl2br(htmlspecialchars($viewdata->f[$data->vwFields['vwdef']])), "</td></tr>\n";
                        echo "</table>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=navlink href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a> |\n";
-               echo "<a class=navlink href=\"$PHP_SELF?action=edit&{$misc->href}&view=", 
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a> |\n";
+               echo "<a class=\"navlink\" href=\"$PHP_SELF?action=edit&{$misc->href}&view=", 
                        urlencode($_REQUEST['view']), "\">{$lang['stredit']}</a></p>\n";
        }
        
@@ -99,10 +182,10 @@
                        
                        echo "<p>", sprintf($lang['strconfdropview'], htmlspecialchars($_REQUEST['view'])), "</p>\n";   
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
-                       echo "<input type=hidden name=action value=drop>\n";
-                       echo "<input type=hidden name=view value=\"", htmlspecialchars($_REQUEST['view']), "\">\n";
+                       echo "<input type=\"hidden\" name=\"action\" value=\"drop\">\n";
+                       echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\">\n";
                        echo $misc->form;
-                       echo "<input type=submit name=choice value=\"{$lang['stryes']}\"> <input type=submit name=choice value=\"{$lang['strno']}\">\n";
+                       echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\"> <input type=\"submi\"t name=\"no\" value=\"{$lang['strno']}\">\n";
                        echo "</form>\n";
                }
                else {
@@ -128,21 +211,21 @@
                echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strviews']}: {$lang['strcreateview']}</h2>\n";
                $misc->printMsg($msg);
                
-               echo "<form action=\"$PHP_SELF\" method=post>\n";
-               echo "<table width=100%>\n";
-               echo "<tr><th class=data>{$lang['strname']}</th></tr>\n";
-               echo "<tr><td class=data1><input name=formView size={$data->_maxNameLen} maxlength={$data->_maxNameLen} value=\"", 
+               echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
+               echo "<table width=\"100%\">\n";
+               echo "<tr><th class=\"data\">{$lang['strname']}</th></tr>\n";
+               echo "<tr><td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", 
                        htmlspecialchars($_POST['formView']), "\"></td></tr>\n";
-               echo "<tr><th class=data>{$lang['strdefinition']}</th></tr>\n";
-               echo "<tr><td class=data1><textarea style=\"width:100%;\" rows=20 cols=50 name=formDefinition wrap=virtual>", 
+               echo "<tr><th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
+               echo "<tr><td class=\"data1\"><textarea style=\"width:100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\" wrap=\"virtual\">", 
                        htmlspecialchars($_POST['formDefinition']), "</textarea></td></tr>\n";
                echo "</table>\n";
-               echo "<input type=hidden name=action value=save_create>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"save_create\">\n";
                echo $misc->form;
-               echo "<input type=submit value=\"{$lang['strsave']}\"> <input type=reset value=\"{$lang['strreset']}\">\n";
+               echo "<input type=\"submit\" value=\"{$lang['strsave']}\"> <input type=\"reset\" value=\"{$lang['strreset']}\">\n";
                echo "</form>\n";
                
-               echo "<p><a class=navlink href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowallviews']}</a></p>\n";
        }
        
        /**
@@ -177,7 +260,8 @@
                
                if ($views->recordCount() > 0) {
                        echo "<table>\n";
-                       echo "<tr><th class=data>{$lang['strview']}</th><th class=data>{$lang['strowner']}</th><th colspan=\"5\" class=data>{$lang['stractions']}</th>\n";
+                       echo "<tr><th class=\"data\">{$lang['strview']}</th><th class=\"data\">{$lang['strowner']}</th>";
+                       echo "<th colspan=\"5\" class=\"data\">{$lang['stractions']}</th>\n";
                        $i = 0;
                        while (!$views->EOF) {
                                // @@@@@@@@@ FIX THIS!!!!!
@@ -185,14 +269,14 @@
                                $count = urlencode("SELECT COUNT(*) AS total FROM \"{$views->f[$data->vwFields['vwname']]}\"");
                                $return_url = urlencode("views.php?{$misc->href}");
                                $id = (($i % 2) == 0 ? '1' : '2');
-                               echo "<tr><td class=data{$id}>", htmlspecialchars($views->f[$data->vwFields['vwname']]), "</td>\n";
-                               echo "<td class=data{$id}>", htmlspecialchars($views->f[$data->vwFields['vwowner']]), "</td>\n";
-                               echo "<td class=opbutton{$id}><a href=\"display.php?{$misc->href}&query={$query}&count={$count}&return_url={$return_url}&return_desc=",
+                               echo "<tr><td class=\"data{$id}\">", htmlspecialchars($views->f[$data->vwFields['vwname']]), "</td>\n";
+                               echo "<td class=\"data{$id}\">", htmlspecialchars($views->f[$data->vwFields['vwowner']]), "</td>\n";
+                               echo "<td class=\"opbutton{$id}\"><a href=\"display.php?{$misc->href}&query={$query}&count={$count}&return_url={$return_url}&return_desc=",
                                        urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></td>\n";
-                               echo "<td class=opbutton{$id}>{$lang['strselect']}</td>\n";
-                               echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=properties&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strproperties']}</a></td>\n"; 
-                               echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strdrop']}</a></td>\n";
-                               echo "<td class=opbutton{$id}><a href=\"privileges.php?{$misc->href}&object=", urlencode($views->f[$data->vwFields['vwname']]),
+                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confselectrows&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strselect']}</a></td>\n"; 
+                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strproperties']}</a></td>\n"; 
+                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strdrop']}</a></td>\n";
+                               echo "<td class=\"opbutton{$id}\"><a href=\"privileges.php?{$misc->href}&object=", urlencode($views->f[$data->vwFields['vwname']]),
                                        "&type=view\">{$lang['strprivileges']}</a></td>\n";
                                echo "</tr>\n";
                                $views->moveNext();
@@ -204,7 +288,7 @@
                        echo "<p>{$lang['strnoviews']}</p>\n";
                }
                
-               echo "<p><a class=navlink href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreateview']}</a></p>\n";
+               echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreateview']}</a></p>\n";
 
        }
 
@@ -212,6 +296,13 @@
        $misc->printBody();
 
        switch ($action) {
+               case 'selectrows':
+                       if (!isset($_POST['cancel'])) doSelectRows(false);
+                       else doDefault();
+                       break;
+               case 'confselectrows':
+                       doSelectRows(true);
+                       break;
                case 'save_create':
                        doSaveCreate();
                        break;
@@ -219,7 +310,7 @@
                        doCreate();
                        break;
                case 'drop':
-                       if ($_POST['choice'] == "{$lang['stryes']}") doDrop(false);
+                       if (isset($_POST['yes'])) doDrop(false);
                        else doDefault();
                        break;
                case 'confirm_drop':
@@ -234,8 +325,6 @@
                case 'properties':
                        doProperties();
                        break;
-               case 'browse':
-                       // @@ Not yet implemented
                default:
                        doDefault();
                        break;