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

CC-2553: Exception thrown

Browse source 
- fixed
This commit is contained in:
James 2011-07-15 17:35:16 -04:00
parent 3e6ca78253
commit 8f1e0a0767
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -362,7 +362,7 @@ class ApiController extends Zend_Controller_Action
$tmpTitle = !(empty($show_name))?$show_name."-":""; $tmpTitle = !(empty($show_name))?$show_name."-":"";
$tmpTitle .= $file->getName(); $tmpTitle .= $file->getName();
$file->setMetadataValue(MDATA_KEY_TITLE, $tmpTitle); $file->setMetadataValue('MDATA_KEY_TITLE', $tmpTitle);
if (!$showCanceled && Application_Model_Preference::GetDoSoundCloudUpload()) if (!$showCanceled && Application_Model_Preference::GetDoSoundCloudUpload())
{ {

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

@ -139,6 +139,8 @@ class StoredFile {
*/ */
public function setMetadataValue($p_category, $p_value) public function setMetadataValue($p_category, $p_value)
{ {
// constant() was used because it gets quoted constant name value from
// api_client.py. This is the wrapper funtion
$this->setDbColMetadataValue(constant($p_category), $p_value); $this->setDbColMetadataValue(constant($p_category), $p_value);
} }
@ -156,7 +158,7 @@ class StoredFile {
if($p_category == "track_title" && (is_null($p_value) || $p_value == "")) { if($p_category == "track_title" && (is_null($p_value) || $p_value == "")) {
return; return;
} }
if (isset($this->_dbMD[$dbColumn])) { if (isset($this->_dbMD[$p_category])) {
$propelColumn = $this->_dbMD[$p_category]; $propelColumn = $this->_dbMD[$p_category];
$method = "set$propelColumn"; $method = "set$propelColumn";
$this->_file->$method($p_value); $this->_file->$method($p_value);
@ -172,7 +174,9 @@ class StoredFile {
*/ */
public function getMetadataValue($p_category) public function getMetadataValue($p_category)
{ {
return $this->getDbColMetadataValue($p_category); // constant() was used because it gets quoted constant name value from
// api_client.py. This is the wrapper funtion
return $this->getDbColMetadataValue(constant($p_category));
} }
/** /**
@ -807,7 +811,7 @@ class StoredFile {
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}');
} }
if (file_exists($duplicate->getFilePath())) { if (file_exists($duplicate->getFilePath())) {
$duplicateName = $duplicate->getMetadataValue(MDATA_KEY_TITLE); $duplicateName = $duplicate->getMetadataValue('MDATA_KEY_TITLE');
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
} }
} }