cvs: pear /MDB/MDB metabase_wrapper.php

lsmith Sat Jan 18 11:26:26 2003 EDT Modified files: /pear/MDB/MDB metabase_wrapper.php Log: cs fixes fixed bug in MetabaseReplace() Index: pear/MDB/MDB/metabase_wrapper.php diff -u pear/MDB/MDB/metabase_wrapper.php:1.48 pear/MDB/MDB/metabase_wrapper.php:1.49 --- pear/MDB/MDB/metabase_wrapper.php:1.48 Mon Dec 23 06:01:40 2002 +++ pear/MDB/MDB/metabase_wrapper.php Sat Jan 18 11:26:25 2003 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: metabase_wrapper.php,v 1.48 2002/12/23 11:01:40 lsmith Exp $ +// $Id: metabase_wrapper.php,v 1.49 2003/01/18 16:26:25 lsmith Exp $ // MDB::loadFile('Date'); @@ -64,10 +64,10 @@ if (MDB::isError($db) || !is_object($db)) { $database = 0; - return $db->getMessage(); + return($db->getMessage()); } $database = $db->database; - return (''); + return(''); } function MetabaseSetupDatabaseObject($arguments, &$db) @@ -76,9 +76,9 @@ $db =& MDB::connect($dsninfo, $options); if (MDB::isError($db) || !is_object($db)) { - return $db->getMessage(); + return($db->getMessage()); } - return (''); + return(''); } function _convertArguments($arguments, &$dsninfo, &$options) @@ -197,7 +197,7 @@ function MetabaseReplace($database, $table, &$fields) { global $_MDB_databases; - for($keys = 0, $condition = $update = $insert = $values = '', reset($fields), $field = 0; + for($count = count($fields), reset($fields), $field = 0; $field < $count; next($fields), $field++) { @@ -1355,7 +1355,7 @@ function MetabaseLOBError($lob) { global $lob_error; - return $lob_error; + return($lob_error); } class metabase_manager_class @@ -1387,10 +1387,10 @@ $result = $this->MDB_manager_object->connect($dsninfo, $options); if (MDB::isError($result)) { - return $result->getMessage(); + return($result->getMessage()); } $this->database = $this->MDB_manager_object->database->database; - return (1); + return(1); } function CloseSetup() @@ -1590,15 +1590,15 @@ $result = $this->MDB_manager_object->connect($dsninfo, $options); if (MDB::isError($result)) { - return $result; + return($result); } $result = $this->MDB_manager_object->updateDatabase($current_schema_file, $previous_schema_file, $variables); if (MDB::isError($result)) { - return $result->getMessage(); + return($result->getMessage()); } $this->database = $this->MDB_manager_object->database->database; - return (1); + return(1); } function DumpDatabaseContents($schema_file, &$setup_arguments, &$dump_arguments, &$variables)