cvs: pear /DB_DataObject DataObject.php package.xml

alan_k Thu Jul 31 00:58:54 2003 EDT Modified files: /pear/DB_DataObject DataObject.php package.xml Log: fix the static get cache properly Index: pear/DB_DataObject/DataObject.php diff -u pear/DB_DataObject/DataObject.php:1.114 pear/DB_DataObject/DataObject.php:1.115 --- pear/DB_DataObject/DataObject.php:1.114 Fri Jul 18 04:32:06 2003 +++ pear/DB_DataObject/DataObject.php Thu Jul 31 00:58:53 2003 @@ -20,7 +20,7 @@ * @package DB_DataObject * @category DB * - * $Id: DataObject.php,v 1.114 2003/07/18 08:32:06 alan_k Exp $ + * $Id: DataObject.php,v 1.115 2003/07/31 04:58:53 alan_k Exp $ */ /** @@ -213,6 +213,7 @@ if (@$_DB_DATAOBJECT['CONFIG']['debug']) { $this->debug("$k $v " .serialize(@$keys), "GET"); } + if ($v === null) { DB_DataObject::raiseError("No Value specified for get", DB_DATAOBJECT_ERROR_INVALIDARGS); return false; @@ -240,7 +241,7 @@ */ function &staticGet($class, $k, $v = null) { - $class = strtolower($class); + $lclass = strtolower($class); global $_DB_DATAOBJECT; if (empty($_DB_DATAOBJECT['CONFIG'])) { DB_DataObject::_loadConfig(); @@ -253,13 +254,13 @@ $key = $k; } if (@$_DB_DATAOBJECT['CONFIG']['debug']) { - DB_DataObject::debug("$class $key","STATIC GET"); + DB_DataObject::debug("$class $key","STATIC GET - TRY CACHE"); } - if (@$_DB_DATAOBJECT['CACHE'][$class][$key]) { - return $_DB_DATAOBJECT['CACHE'][$class][$key]; + if (@$_DB_DATAOBJECT['CACHE'][$lclass][$key]) { + return $_DB_DATAOBJECT['CACHE'][$lclass][$key]; } if (@$_DB_DATAOBJECT['CONFIG']['debug']) { - DB_DataObject::debug("$class $key","STATIC GET"); + DB_DataObject::debug("$class $key","STATIC GET - NOT IN CACHE"); } $obj = DB_DataObject::factory(substr($class,strlen($_DB_DATAOBJECT['CONFIG']['class_prefix']))); @@ -268,15 +269,15 @@ return false; } - if (!@$_DB_DATAOBJECT['CACHE'][$class]) { - $_DB_DATAOBJECT['CACHE'][$class] = array(); + if (!@$_DB_DATAOBJECT['CACHE'][$lclass]) { + $_DB_DATAOBJECT['CACHE'][$lclass] = array(); } if (!$obj->get($k,$v)) { DB_DataObject::raiseError("No Data return from get $k $v", DB_DATAOBJECT_ERROR_NODATA); return false; } - $_DB_DATAOBJECT['CACHE'][$class][$key] = $obj; - return $_DB_DATAOBJECT['CACHE'][$class][$key]; + $_DB_DATAOBJECT['CACHE'][$lclass][$key] = $obj; + return $_DB_DATAOBJECT['CACHE'][$lclass][$key]; } /** Index: pear/DB_DataObject/package.xml diff -u pear/DB_DataObject/package.xml:1.52 pear/DB_DataObject/package.xml:1.53 --- pear/DB_DataObject/package.xml:1.52 Fri Jul 18 04:32:06 2003 +++ pear/DB_DataObject/package.xml Thu Jul 31 00:58:53 2003 @@ -24,12 +24,11 @@ <release> - <version>1.0.1</version> - <date>2003-07-18</date> + <version>1.0.2</version> + <date>2003-08-01</date> <notes> Minor Bugfix Release - - Fix Select defaults back to * after an update - - Fix Update with NULL values + - Fix static Get call, case sensitivity properly. </notes> <state>stable</state> @@ -62,6 +61,23 @@ <changelog> + + + + + <release> + <version>1.0.1</version> + <date>2003-07-18</date> + <notes> + Minor Bugfix Release + - Fix Select defaults back to * after an fetch + - Fix Update with NULL values + + </notes> + <state>stable</state> + </release> + + <release> <version>1.0</version> <date>2003-07-16</date>