From 06209ca22442fff88798c2a487a317613e885280 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 17 Jul 2012 10:21:06 -0400 Subject: [PATCH] cc-4105: removed useless comments --- .../application/controllers/ApiController.php | 13 +++++-------- python_apps/api_clients/api_client.py | 13 ------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 3e9c5cbb7..00ee79cdc 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -456,8 +456,8 @@ class ApiController extends Zend_Controller_Action // path already exist if ($file->getFileExistsFlag()) { // file marked as exists - $this->view->error = "File already exists in Airtime."; - return; + # TODO : jsonify all the error messages mang + return "File already exists in Airtime."; } else { // file marked as not exists $file->setFileExistsFlag(true); @@ -471,8 +471,7 @@ class ApiController extends Zend_Controller_Action //File is not in database anymore. if (is_null($file)) { - $this->view->error = "File does not exist in Airtime."; - return; + return "File does not exist in Airtime."; } //Updating a metadata change. else { @@ -484,8 +483,7 @@ class ApiController extends Zend_Controller_Action $file = Application_Model_StoredFile::RecallByMd5($md5); if (is_null($file)) { - $this->view->error = "File doesn't exist in Airtime."; - return; + return "File doesn't exist in Airtime."; } else { $filepath = $md['MDATA_KEY_FILEPATH']; @@ -499,8 +497,7 @@ class ApiController extends Zend_Controller_Action $file = Application_Model_StoredFile::RecallByFilepath($filepath); if (is_null($file)) { - $this->view->error = "File doesn't exist in Airtime."; - return; + return "File doesn't exist in Airtime."; } else { $file->deleteByMediaMonitor(); diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index 91564ce01..4d03d8ff2 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -403,19 +403,6 @@ class AirtimeApiClient(): req = urllib2.Request(url, data) response = self.get_response_from_server(req) response = json.loads(response) - # TODO : this request returns a more detailed response of what - # happened through a json array. Hence we should handle errors - # differently - # we would like to move all of this to the controller since we are - # not doing anything here - #if("error" not in response and is_record): - #url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["upload_recorded"]) url = url.replace("%%fileid%%", str(response[u'id'])) - #url = url.replace("%%showinstanceid%%", str(md_list['MDATA_KEY_TRACKNUMBER'])) - #url = url.replace("%%api_key%%", self.config["api_key"]) - - #response = self.get_response_from_server(url) - #response = json.loads(response) - #logger.info("associate recorded %s", response) return response except Exception, e: logger.error('Exception: %s', e)