Upload catalog from ASCII format (#6503)

Benjamin Renard
1 parent 53048303
Showing 3 changed files with 15 additions and 25 deletions Show diff stats
js/app/views/UploadPanelUI.js
php/classes/AmdaAction.php
php/classes/CatalogMgr.php
@@ -70,9 +70,14 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				}
 			}); 
 		} 
-		else {   
+		else { 
 			// EXCEPTION : parameter not found !
-			myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"+this.tmpNode.get('text')+"' found!");	     
+			if (result.error) {
+				myDesktopApp.errorMsg(result.error);
+			}
+			else {
+				myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"+this.tmpNode.get('text')+"' found!");	     
+			}
 		}
  
 		loadMask.hide();
@@ -443,38 +448,22 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 			this.nodeType = 'amdaModel.TimeTableNode';
  
 			this.store = Ext.create('Ext.data.Store', {
-				fields: ['value', 'name']/*,
-				proxy: {
-					type: 'ajax',
-					url : 'generic_data/remote_sites.json',
-					reader: {
-						type: 'json',
-						root: 'remote_sites'
-					}
-				},
-				autoLoad: true*/
+				fields: ['value', 'name']
 			});
  
 			this.radioId =	'ttfrmt';
 		}
 		else {
 			this.formats = [
-				{ boxLabel: 'VOTable', name: 'catfrmt', inputValue: 'VOT', checked: true }];
+				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'catfrmt',  inputValue: 'ASCII', checked: true},
+				{ boxLabel: 'VOTable', name: 'catfrmt', inputValue: 'VOT'}
+			];
  
 			this.localUploadId = 'form-uploadcat';
 			this.remoteUploadId = 'form-uploadcaturl'; 
 			this.nodeType = 'amdaModel.CatalogNode';
 			this.store = Ext.create('Ext.data.Store', {
-				fields: ['value', 'name']/*,
-				proxy: {
-					type: 'ajax',
-					url : 'generic_data/remote_sites.json',
-					reader: {
-						type: 'json',
-						root: 'remote_sites'
-					}
-				},
-				autoLoad: true*/
+				fields: ['value', 'name']
 			}); 
  
 			this.radioId = 'catfrmt';
@@ -1423,6 +1423,7 @@ class AmdaAction
 	public function cleanUserWS()
 	{
 		$this->rrmdir(USERDIR.'DOWNLOAD.TEMP');
+		$this->rrmdir(USERDIR.'TEMP');
 		IHMConfigClass::setUserName($this->user);
  
 		// delete impex params and data
@@ -223,14 +223,14 @@ class CatalogMgr extends TimeTableMgr
  
 			public function getUploadedObject($name, $format, $onlyDescription = false)
 			{
-				/*$result = parent::getUploadedObject($name, $format, $onlyDescription);
+				$result = parent::getUploadedObject($name, $format, $onlyDescription);
 				if (!isset($result['success']) || !$result['success']) {
  
 					return array('success' => FALSE, 'error' => 'Error to retrieve catalog info');
 				}
  
  
-					return $result + array('parameters' => $this->getCatalogParamDescription(array('folder' => $folderId, 'name' => $name));*/
+				return $result + array('parameters' => $this->getCatalogParamDescription(array('folder' => USERTEMPDIR, 'name' => $name)));
 			}
  
 			/**