diff --git a/database.php b/database.php
index 5792311de..4fa97f1c9 100755
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
/**
* Manage schemas within a database
*
- * $Id: database.php,v 1.92 2007/04/18 13:29:25 ioguix Exp $
+ * $Id: database.php,v 1.93 2007/04/20 15:56:39 ioguix Exp $
*/
// Include application functions
@@ -174,34 +174,34 @@ function doFind($confirm = true, $msg = '') {
switch ($curr) {
case 'SCHEMA':
- echo "href}&schema={$misc->printVal($rs->fields['name'])}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
+ echo "href}&schema=", $misc->printVal($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'TABLE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&table=",
urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'VIEW':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&view=",
urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'SEQUENCE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']),
"&sequence=", urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'COLUMNTABLE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
- echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
+ echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&table=",
urlencode($rs->fields['relname']), "&column=", urlencode($rs->fields['name']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
@@ -209,8 +209,8 @@ function doFind($confirm = true, $msg = '') {
case 'COLUMNVIEW':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
- echo "href}&view=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
+ echo "href}&view=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&view=",
urlencode($rs->fields['relname']), "&column=", urlencode($rs->fields['name']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
@@ -218,53 +218,53 @@ function doFind($confirm = true, $msg = '') {
case 'INDEX':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
- echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "}.";
+ echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&table=", urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'CONSTRAINTTABLE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
- echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
+ echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&table=",
urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'CONSTRAINTDOMAIN':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&domain=", urlencode($rs->fields['relname']), "\">",
$misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'TRIGGER':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}.";
- echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), ".";
+ echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&table=", urlencode($rs->fields['relname']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'RULETABLE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}.";
- echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), ".";
+ echo "href}&table=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&reltype=table&table=",
urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'RULEVIEW':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}.";
- echo "href}&view=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($rs->fields['relname'])}.";
+ echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), ".";
+ echo "href}&view=", urlencode($rs->fields['relname']), "&schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&reltype=view&view=",
urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'FUNCTION':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&function=",
urlencode($rs->fields['name']), "&function_oid=", urlencode($rs->fields['oid']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
@@ -272,28 +272,28 @@ function doFind($confirm = true, $msg = '') {
case 'TYPE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&type=",
urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'DOMAIN':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&domain=",
urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'OPERATOR':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "&operator=",
urlencode($rs->fields['name']), "&operator_oid=", urlencode($rs->fields['oid']) ,"\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'CONVERSION':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']),
"\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
@@ -303,14 +303,14 @@ function doFind($confirm = true, $msg = '') {
case 'AGGREGATE':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;
case 'OPCLASS':
echo "";
if (!empty($prefix))
- echo "href}&schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}.";
+ echo "href}&schema=", urlencode($prefix), "\">", $misc->printVal($prefix), ".";
echo "href}&schema=", urlencode($rs->fields['schemaname']), "\">",
_highlight($misc->printVal($rs->fields['name']), $_GET['term']), "\n";
break;