fix search results for non-schema aware dbs

diff --git a/database.php b/database.php
index b59bbeb8f8a6caa63b6504ae206018b9d814f96c..e692d8f37c5c0eb34da841e229fab67312c04643 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.18 2003/08/27 08:09:27 chriskl Exp $
+        * $Id: database.php,v 1.19 2003/09/03 05:47:48 chriskl Exp $
         */
 
        // Include application functions
@@ -76,39 +76,46 @@
                                                echo "</h2>";
                                                echo "<ul>\n";
                                        }
+                                       
+                                       // Generate schema prefix
+                                       if ($localData->hasSchemas())
+                                               $prefix = $rs->f['schemaname'] . '.';
+                                       else
+                                               $prefix = '';
+                                               
                                        switch ($curr) {
                                                case 'SCHEMA':                                          
                                                        echo "<li><a href=\"database.php?{$misc->href}\">", _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TABLE':
                                                        echo "<li><a href=\"tblproperties.php?{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&table=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'VIEW':
                                                        echo "<li><a href=\"views.php?action=properties&{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&view=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'SEQUENCE':
                                                        echo "<li><a href=\"sequences.php?action=properties&{$misc->href}&schema=", urlencode($rs->f['schemaname']), 
-                                                               "&sequence=", urlencode($rs->f['name']), "\">", $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               "&sequence=", urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'COLUMN':
                                                        echo "<li><a href=\"tblproperties.php?{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&table=", 
                                                                urlencode($rs->f['relname']), "&column=", urlencode($rs->f['name']), "&action=properties\">", 
-                                                               $misc->printVal($rs->f['schemaname']), '.', $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               $misc->printVal($prefix), $misc->printVal($rs->f['relname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'FUNCTION':
                                                        echo "<li><a href=\"functions.php?action=properties&{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&function=", 
                                                                urlencode($rs->f['name']), "&function_oid=", urlencode($rs->f['oid']), "\">", 
-                                                               $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TYPE':
                                                        echo "<li><a href=\"types.php?action=properties&{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&type=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'OPERATOR':
                                                        echo "<li><a href=\"operators.php?{$misc->href}&schema=", urlencode($rs->f['schemaname']), "&operator=", 
-                                                               urlencode($rs->f['name']), "\">", $misc->printVal($rs->f['schemaname']), '.', _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
+                                                               urlencode($rs->f['name']), "\">", $misc->printVal($prefix), _highlight($misc->printVal($rs->f['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                        }
                                        $rs->moveNext();