alan_k Mon Jun 24 06:01:00 2002 EDT
Modified files:
/pear/DB_DataObject DataObject.php
Log:
typos, and warnings
Index: pear/DB_DataObject/DataObject.php
diff -u pear/DB_DataObject/DataObject.php:1.4
pear/DB_DataObject/DataObject.php:1.5
--- pear/DB_DataObject/DataObject.php:1.4 Mon Jun 24 05:29:34 2002
+++ pear/DB_DataObject/DataObject.php Mon Jun 24 06:00:58 2002
@@ -26,6 +26,12 @@
define("DB_DATAOBJECT_BOOL", 16); // is boolean #TODO
define("DB_DATAOBJECT_TXT", 32); // is long text #TODO
+/* error defines */
+define("DB_DATAOBJECT_ERROR_INVALIDARGS", 1); // wrong args to function
+define("DB_DATAOBJECT_ERROR_NODATA", 2); // no data available
+define("DB_DATAOBJECT_ERROR_INVALIDCONFIG", 3); // something wrong with the
config
+define("DB_DATAOBJECT_ERROR_NOCLASS", 4); // no class exists
+
/* Object Based DB class - extend this for using with specific tables!
// Example INI File
@@ -187,7 +193,7 @@
DB_DataObject::raiseError("could not autoload $class",
DB_DATAOBJECT_ERROR_NOCLASS);
return;
}
- $obj = &new $newclassclass;
+ $obj = &new $newclass;
if (!$obj) {
DB_DataObject::raiseError("Error creating $newclass",
DB_DATAOBJECT_ERROR_NOCLASS);
return;
@@ -1071,12 +1077,20 @@
}
$table = substr($row,0,$p);
}
+ if (!isset($this->$row)) {
+ DB_DataObject::raiseError("getLink: row not set $row",
DB_DATAOBJECT_ERROR_NODATA);
+ return;
+ }
+
+
$class = $this->_autoloadTable($table);
if (!$class) {
DB_DataObject::raiseError("getLink:Could not find class for row
$row, table $table", DB_DATAOBJECT_ERROR_INVALIDCONFIG);
- return FALSE;
+ return;
}
- return DB_DataObject::staticGet($class,$this->$key);
+
+
+ return DB_DataObject::staticGet($class,$this->$row);
}
/*
* return a list of options for a linked table
@@ -1200,7 +1214,7 @@
if ($v !== NULL) {
$options['debug'] = $v;
}
- return $options['debug'];
+ return @$options['debug'];
}
/**
--
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|