Minor improvements to blobs

This commit is contained in:
Deon George
2012-01-01 20:41:42 +11:00
parent 6672913460
commit 407eed04c9
6 changed files with 30 additions and 38 deletions

View File

@@ -46,21 +46,14 @@ class Model_Setup extends ORMOSB {
if (! $mo->loaded())
throw new Kohana_Exception('Unknown module :name',array(':name'=>$key));
static $mc = array();
if (! $mc)
$mc = $this->blob($this->module_config);
// If $value is NULL, we are a getter
if ($value === NULL)
return empty($mc[$mo->id]) ? array() : $mc[$mo->id];
return empty($this->module_config[$mo->id]) ? array() : $this->module_config[$mo->id];
// Store new value
$mc[$mo->id] = $value;
$this->module_config = $this->blob($mc,TRUE);
$this->save();
$this->module_config[$mo->id] = $value;
return $this->saved();
return $value;
}
/**
@@ -70,17 +63,12 @@ class Model_Setup extends ORMOSB {
* @param $value Values to store. If NULL, retrieves the value stored, otherwise stores value.
*/
public function site_details($key,array $value=NULL) {
static $sc = array();
if (! $sc AND $this->site_details)
$sc = $this->blob($this->site_details);
if (! in_array($key,array('name','address1','address2','city','state','pcode','phone','fax','email')))
throw new Kohana_Exception('Unknown Site Configuration Key :key',array(':key'=>$key));
// If $value is NULL, we are a getter
if ($value === NULL)
return empty($sc[$key]) ? '' : $sc[$key];
return empty($this->site_details[$key]) ? '' : $this->site_details[$key];
// Store new value
$sc[$key] = $value;

View File

@@ -104,6 +104,17 @@ abstract class ORMOSB extends ORM {
$model->$field = serialize($value);
}
public function __get($column) {
// If the column is a blob, we'll decode it automatically
if (array_key_exists($column,$this->_object) AND $this->_table_columns[$column]['data_type'] == 'blob' AND (! isset($this->_table_columns[$column]['auto_convert']) OR ! $this->_table_columns[$column]['auto_convert'])) {
$this->_object[$column] = $this->blob($this->_object[$column]);
$this->_table_columns[$column]['auto_convert'] = TRUE;
}
return parent::__get($column);
}
public function save(Validation $validation = NULL) {
// Find any fields that have changed, and that are blobs, and encode them.
if ($this->_changed)
@@ -121,7 +132,7 @@ abstract class ORMOSB extends ORM {
/**
* Retrieve and Store DB BLOB data.
*/
protected function blob($data,$set=FALSE) {
private function blob($data,$set=FALSE) {
return $set ? gzcompress(serialize($data)) : unserialize(gzuncompress($data));
}
}