Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-3936-3' into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-08-27 14:46:31 -04:00
commit 1a13731216
9 changed files with 190 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/models/StoredFile.php
View file

@ -122,9 +122,14 @@ class Application_Model_StoredFile
$p_md["MDATA_KEY_YEAR"] = $year;
}
# Translate metadata attributes from media monitor (MDATA_KEY_*)
# to their counterparts in constants.php (usually the column names)
foreach ($p_md as $mdConst => $mdValue) {
if (defined($mdConst)) {
$dbMd[constant($mdConst)] = $mdValue;
} else {
Logging::info("Warning: using metadata that is not defined.
[$mdConst] => [$mdValue]");
}
}
$this->setDbColMetadata($dbMd);
@ -150,10 +155,9 @@ class Application_Model_StoredFile
if(!$owner) { // no owner detected, we try to assign one.
// if MDATA_OWNER_ID is not set then we default to the
// first admin user we find
if (!array_key_exists('MDATA_OWNER_ID', $p_md)) {
if (!array_key_exists('MDATA_KEY_OWNER_ID', $p_md)) {
//$admins = Application_Model_User::getUsers(array('A'));
$admins = Application_Model_User::getUsersOfType('A');
//$admins = array();
if (count($admins) > 0) { // found admin => pick first one
$owner = $admins[0];
}
@ -183,7 +187,6 @@ class Application_Model_StoredFile
if (isset($this->_dbMD[$dbColumn])) {
$propelColumn = $this->_dbMD[$dbColumn];
$method = "set$propelColumn";
Logging::info($method);
$this->_file->$method($mdValue);
}
}