Commit a76e32db1f8ad373fe0911ccafeaab37876444ea
1 parent
e516c132
Exists in
master
and in
111 other branches
Remove old obsolet code used to export download result by SAMP
Showing
4 changed files
with
0 additions
and
44 deletions
Show diff stats
js/app/views/TabResultUI.js
| ... | ... | @@ -145,25 +145,6 @@ Ext.define('amdaUI.ResultItem', { |
| 145 | 145 | |
| 146 | 146 | var me = this; |
| 147 | 147 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) { |
| 148 | - loadMask.show(); | |
| 149 | - | |
| 150 | - AmdaAction.sendToSAMP(o,function (result, e){ | |
| 151 | - loadMask.hide(); | |
| 152 | - if (!result.success) { | |
| 153 | - Ext.Msg.show( { | |
| 154 | - title : 'SAMP - Cannot send VOTable', | |
| 155 | - msg : result.message, | |
| 156 | - modal : true, | |
| 157 | - icon : Ext.Msg.ERROR, | |
| 158 | - buttons : Ext.Msg.OK | |
| 159 | - }); | |
| 160 | - return; | |
| 161 | - } | |
| 162 | - | |
| 163 | - Ext.each(result.files,function (file) { | |
| 164 | - module.sendVOTable(file,clientId); | |
| 165 | - }, me); | |
| 166 | - }, me); | |
| 167 | 148 | }); |
| 168 | 149 | }, |
| 169 | 150 | |
| ... | ... |
php/classes/AmdaAction.php
| ... | ... | @@ -1160,24 +1160,6 @@ class AmdaAction |
| 1160 | 1160 | } |
| 1161 | 1161 | |
| 1162 | 1162 | /* |
| 1163 | - * SAMP | |
| 1164 | - */ | |
| 1165 | - public function sendToSAMP($o) | |
| 1166 | - { | |
| 1167 | - if ($this->amdaStat->success) | |
| 1168 | - $this->amdaStat->addTask('samp', $this->user, null); | |
| 1169 | - | |
| 1170 | - $objectMgr = new RequestMgr(); | |
| 1171 | - $res = $objectMgr->generateVOTableFromDownloadResult($o->folderId, $o->downId,true,true); | |
| 1172 | - if ($res['success']) | |
| 1173 | - { | |
| 1174 | - foreach ($res['files'] as $key => $value) | |
| 1175 | - $res['files'][$key] = str_replace(BASE_PATH,"",$value); | |
| 1176 | - } | |
| 1177 | - return $res; | |
| 1178 | - } | |
| 1179 | - | |
| 1180 | -/* | |
| 1181 | 1163 | * HST Images |
| 1182 | 1164 | */ |
| 1183 | 1165 | public function getHstImagesUrl($o) |
| ... | ... |
php/classes/RequestMgr.php
| ... | ... | @@ -71,12 +71,6 @@ class RequestMgr extends AmdaObjectMgr |
| 71 | 71 | return false; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - public function generateVOTableFromDownloadResult($id,$newName,$inputCompressed = true,$canBeAlreadyVOTable = false) | |
| 75 | - { | |
| 76 | - //TODO - use the new kernel | |
| 77 | - $res = array('success' => false, 'message' => 'NOT IMPLEMENTED => To implement with the new Kernel'); | |
| 78 | - } | |
| 79 | - | |
| 80 | 74 | /* Stop Time from StartTime and Interval*/ |
| 81 | 75 | public function convertTime($obj) |
| 82 | 76 | { |
| ... | ... |
php/config.php
| ... | ... | @@ -189,7 +189,6 @@ $API = array( |
| 189 | 189 | 'sendFeedback'=>array('len'=>1), |
| 190 | 190 | 'saveState'=>array('len'=>1), |
| 191 | 191 | 'loadState'=>array('len'=>1), |
| 192 | - 'sendToSAMP'=>array('len'=>1), | |
| 193 | 192 | 'getHstImagesUrl'=>array('len'=>1), |
| 194 | 193 | 'getAPISImagesUrl'=>array('len'=>1), |
| 195 | 194 | 'loadFilterList'=>array('len'=>0), |
| ... | ... |