cvs: pear /MDB/MDB ibase.php

quipo Mon Sep 8 13:29:07 2003 EDT Modified files: /pear/MDB/MDB ibase.php Log: phpdoc addition fixes in buffered row number Index: pear/MDB/MDB/ibase.php diff -u pear/MDB/MDB/ibase.php:1.44 pear/MDB/MDB/ibase.php:1.45 --- pear/MDB/MDB/ibase.php:1.44 Mon Sep 8 07:56:02 2003 +++ pear/MDB/MDB/ibase.php Mon Sep 8 13:29:07 2003 @@ -42,7 +42,7 @@ // | Author: Lorenzo Alberton <l.alberton@quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.44 2003/09/08 11:56:02 lsmith Exp $ +// $Id: ibase.php,v 1.45 2003/09/08 17:29:07 quipo Exp $ require_once 'MDB/Common.php'; @@ -321,7 +321,13 @@ // }}} // {{{ getDatabaseFile() - function getDatabaseFile($database_name) + /** + * Builds the string with path+dbname+extension + * + * @return string full database path+file + * @access private + */ + function _getDatabaseFile($database_name) { if (isset($this->options['database_path'])) { $this->database_path = $this->options['database_path']; @@ -385,7 +391,7 @@ **/ function connect() { - $database_file = $this->getDatabaseFile($this->database_name); + $database_file = $this->_getDatabaseFile($this->database_name); if ($this->connection != 0) { if (count(array_diff($this->connected_dsn, $this->dsn)) == 0 @@ -968,7 +974,7 @@ $row = @ibase_fetch_row($result); } //NOT SURE IF REALLY OK... basically it doesn't process $row if it's false - if(is_array($row)) { + if (is_array($row)) { foreach ($row as $key => $value_with_space) { $row[$key] = rtrim($value_with_space); } @@ -982,10 +988,9 @@ } } if ($fetchmode == MDB_FETCHMODE_ASSOC) { - $row = $this->results[$result_value][$rownum]; + $row = $this->results[$result_value][$rownum+1]; } else { - $row = array_values($this->results[$result_value][$rownum]); - + $row = array_values($this->results[$result_value][$rownum+1]); } $this->results[$result_value]['highest_fetched_row'] = max($this->results[$result_value]['highest_fetched_row'], $rownum);