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

cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction

This commit is contained in:
Rudi Grinberg 2012-07-17 12:01:50 -04:00
parent b021c3e925
commit b0f5b722db
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/controllers/ApiController.php
View File

@ -447,7 +447,7 @@ class ApiController extends Zend_Controller_Action
$this->view->watched_dirs = $watchedDirsPath; $this->view->watched_dirs = $watchedDirsPath;
} }
public function dispatchMetaDataAction($md, $mode, $dryrun=false) public function dispatchMetadataAction($md, $mode, $dry_run=false)
{ {
// Replace this compound result in a hash with proper error handling later on // Replace this compound result in a hash with proper error handling later on
$return_hash = array(); $return_hash = array();
@ -540,13 +540,18 @@ class ApiController extends Zend_Controller_Action
// The value is a json encoded hash that has all the information related to this action // The value is a json encoded hash that has all the information related to this action
// The key does not have any meaning as of yet but it could potentially correspond // The key does not have any meaning as of yet but it could potentially correspond
// to some unique id. // to some unique id.
Logging::log("Entering controller, mang");
$responses = array(); $responses = array();
foreach ($request->getParams() as $k => $raw_json) { foreach ($request->getParams() as $k => $raw_json) {
$info_json = json_decode($raw_json, $assoc=true); $info_json = json_decode($raw_json, $assoc=true);
if( !array_key_exists('mode', $info_json) ) {
Logging::log("Received bad request, no 'mode' parameter");
Logging::log( $info_json );
continue;
}
$mode = $info_json['mode']; $mode = $info_json['mode'];
unset( $info_json['mode'] ); unset( $info_json['mode'] );
// TODO : uncomment the following line to actually do something $response = $this->dispatchMetadataAction($info_json, $info_json['mode'], $dry_run=true);
$response = $this->dispatchMetaDataAction($info_json, $info_json['mode']);
array_push($responses, $response); array_push($responses, $response);
// Like wise, remove the following line when done // Like wise, remove the following line when done
// On recorded show requests we do some extra work here. Not sure what it actually is and it // On recorded show requests we do some extra work here. Not sure what it actually is and it