Merge branch 'upload_cdf_upgrade' into 'master'

Upload cdf upgrade See merge request !20

Merge branch 'upload_cdf_upgrade' into 'master'
Upload cdf upgrade See merge request !20
Elena Budnik
2 parents cedf0315 48a8a598
Showing 18 changed files with 2152 additions and 1646 deletions Show diff stats
generic_data/remote_sites.json
js/app/controllers/UploadModule.js
js/app/models/InteractiveNode.js
js/app/models/MyDataNode.js
js/app/models/MyDataParamNode.js
js/app/views/ExplorerUI.js
js/app/views/MyDataUI.js
js/app/views/RemoteSearchPlugin.js
js/app/views/UploadPanelUI.js
js/app/views/UploadUI.js
php/classes/FilesMgr.php
php/src/Makefile
php/src/cdfsamplingfromdata.c
php/src/cdfsamplingsfromdata.c
php/src/cdfvar_attr.c
php/src/cdfvarinfo.c
php/src/ncvar_attr.c
php/uploadFile.php
@@ -0,0 +1,3 @@
+{"remote_sites": [ 
+   {"name": "CDAWeb", "value": "https://cdaweb.gsfc.nasa.gov/pub/data/"}                 
+]}
@@ -20,8 +20,8 @@ Ext.define(&#39;amdaDesktop.UploadModule&#39;, {
 	* @cfg {String} window definitions
 	* @required
 	*/
-	width: 320, 
-	height: 510,
+	width: 330, 
+	height: 520,
 	uiType : 'panelTabUpload',
 	helpTitle : 'Help on Upload Module',
 	helpFile : 'uploadHelp',
@@ -200,22 +200,11 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					if (res.info) {
 						this.set('info',res.info);
-					} 
-					
-					if (this.get('nodeType') == 'myDataParam') {
-						if (res.isSpectra) {
-							this.set('iconCls', 'icon-spectra');
-						} 
-						else { 
-							if (res.size > 1) this.set('iconCls', 'icon-unknowntype');
-						}
 					}
-					// update my data on possibble mask change		    
-					if (res.updateMyData) {
-						this.updateMyData();
-						this.updateMask(res.mask);
-					}
+					// myDataParam special update
+					this.specialUpdate(res, false);
+					
 					// reload object into the view of corresponding Module
 					var me = this;
 					myDesktopApp.getLoadedModule(this.get('moduleId'), true, function (module) {
@@ -282,30 +271,10 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					if (res.info){
 						// set the tooltip
 						this.set('info',res.info);
-						//set globalStart & global Stop to be used for time selection
-						if (this.get('nodeType') == 'myDataParam')
-						{
-							var startStop = res.info.split("<br/>"); 
-							var globalStart = startStop[1].substr(0,19);
-							var globalStop = startStop[1].substr(20);
-							
-							this.set('globalStart', globalStart);
-							this.set('globalStop', globalStop);
-							
-							if (res.mask)
-								this.set('linkedMask', res.mask);
-							if (res.size) 
-								this.set('size', res.size);
-							
-							if (res.isSpectra) {
-								this.set('iconCls', 'icon-spectra');
-							} 
-							else { 
-								if (res.size > 1) 
-									this.set('iconCls', 'icon-unknowntype');
-							}
-						}
-					}                                                         
+					}
+					//set globalStart & global Stop to be used for time selection
+					this.specialUpdate(res, true);
+                                                        
 					//TODO do we need this commission ???
 					// fix the modifications for object
 					this.get('object').commit(); 
@@ -333,14 +302,6 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 									opt.callback.call(scope,'create');
 						}                                                
 					}, this);
-        
-					// myDataParamNode - update MyData subtree 
-					//TODO put this in mydataparamnode
-					if (res.updateMyData) {
-						this.updateMyData();
-						this.updateMask(res.mask);
-					} 
-				
 				}               
 				// error code from server; but e.status==true
 				else {
@@ -359,6 +320,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		},this);         
 	},
+	specialUpdate : function() {},
 /**
 * Generic part of Context Menu
 *  
@@ -188,9 +188,9 @@ Ext.define(&#39;amdaModel.MyDataNode&#39;, {
         if (myParamRootNode.isExpanded) {                                       
             Ext.Array.each(myParamRootNode.childNodes, function(node) {
                 if (node.get('linkedMask')  &&  node.get('linkedMask') == mask) {
-                    var globalStart =  maskDesc.substr(0,16);
-                    var globalStop = maskDesc.substr(17,16);
-                                        
+                    var globalStart =  maskDesc.substr(0,19);
+                    var globalStop = maskDesc.substr(20);
+						  
                     node.set('globalStart', globalStart);
                     node.set('globalStop', globalStop); 
                     if (node.get('info')) {
@@ -31,12 +31,13 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
 		this.set('objectDataModel','amdaModel.FileParamObject');         
 		if (this.get('isParameter')) {
 			if (this.get('size') == 1) 
-				this.set('iconCls', 'icon-scalar');      
-			else if (this.get('size') == 3) 
+				this.set('iconCls', 'icon-scalar');     
+			else if(this.get('size') == 3) 
 				this.set('iconCls', 'icon-vector');
 			else
 				this.set('iconCls', 'icon-unknowntype');            
 		}
+
 		if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');          
 	},
@@ -76,7 +77,7 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
 	},
 	getAllContextMenuItems: function() 
-	{    
+	{	    
 		var menuItems = this.allMenuItems('Parameter');
 		var locMenuItems = this.localMenuItems();
@@ -87,52 +88,53 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
 	{
 		var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
-		switch (fnId) {
+		switch (fnId) 
+		{
 			case 'deleteNode':
 				this.deleteNode(); 
 				break;
 			case 'createDir':
 				this.createDir(); 
-					break;
+				break;
 			case 'createLeaf':
-					this.createLeaf(this);
-					break;                    
+				this.createLeaf(this);
+				break;                    
 			case 'renameNode':
-					this.renameNode();
-					break;
+				this.renameNode();
+				break;
 			case 'editLeaf':   
-					this.editLeaf(); 
-					break;
+				this.editLeaf(); 
+				break;
 			case 'upload':   
-					this.uploadFile(); 
-					break;
-            
+				this.uploadFile(); 
+				break;
+				
 			case 'plotParam':                 
-					this.createPlot(this);                
-					break;
-					
+				this.createPlot(this);                
+				break;
+				
 			case 'downParam':                   
-					this.createDownload(this);                
-					break; 
-            
+				this.createDownload(this);                
+				break; 
+				
 			default:
-					break;
-			} // switch end 
-
-    },
+				break;
+		} // switch end 
+	},
 	uploadFile: function() {
 		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.upload.id, true, function (module) {
 			module.createWindow();
 		});
 	}, 
-    
-	editLeaf: function() {
+
+	editLeaf: function() 
+	{
 		// load the rootNode and recursively all its child nodes
 		// to know all names of DerivedParameters
 		var me = this;
@@ -161,20 +163,20 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
 		var t = remoteEvent.getTransaction();
 		if (result) { 
 			if (result.id) {
-				var paramObj = Ext.create(this.get('objectDataModel'), result);
-				// set parameter into node
-				this.set('object',paramObj);
-				
-				paramObj.set('tableDef', result['tableDef']);
-				
-				if (paramObj.get('mask')) var file = paramObj.get('mask');
-				else  var file = paramObj.get('file'); 
-		
-				AmdaAction.getObject(file, amdaModel.MyDataNode.nodeType, 
-												this.getFileObjectCallback, this);              
+					var paramObj = Ext.create(this.get('objectDataModel'), result);
+					// set parameter into node
+					this.set('object',paramObj);
+					
+					paramObj.set('tableDef', result['tableDef']);
+					
+					if (paramObj.get('mask')) var file = paramObj.get('mask');
+					else  var file = paramObj.get('file'); 
+			
+					AmdaAction.getObject(file, amdaModel.MyDataNode.nodeType, 
+													this.getFileObjectCallback, this);              
 			}
 			else {                 
-				myDesktopApp.errorMsg(result.error);
+					myDesktopApp.errorMsg(result.error);
 			}
 		}
 		else {
@@ -226,24 +228,59 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
 	},
 	updateMyData : function(){
-		// reload myFiles Tree in explorer
-		var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
-		if (explorerTree) {					  
-				var explorerTreeStore = explorerTree.getStore();
-				var explorerRoot = explorerTreeStore.getRootNode().findChild('text','My Files');
-				
-				var explorerPath = '/root/myData-treeRootNode/';
-				
-				explorerTreeStore.reload({node : explorerRoot, 
-												params : { nodeType: 'myData'},
-												callback : function(){	
-														explorerTree.selectPath(explorerPath);						 
-												}
-				});	      	 
-		}     
+			// reload myFiles Tree in explorer
+			var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
+			if (explorerTree) {					  
+					var explorerTreeStore = explorerTree.getStore();
+					var explorerRoot = explorerTreeStore.getRootNode().findChild('text','My Files');
+					
+					var explorerPath = '/root/myData-treeRootNode/';
+					
+					explorerTreeStore.reload({node : explorerRoot, 
+													params : { nodeType: 'myData'},
+													callback : function(){	
+															explorerTree.selectPath(explorerPath);						 
+													}
+					});	      	 
+			}     
 	},
 	isParameter : function(){
 		return this.get('isParameter');
-	} 
+	},
+	
+	specialUpdate : function(res, timeUpdate)
+	{
+		if (timeUpdate && res.info)
+		{
+			var startStop = res.info.split("<br/>"); 
+			var globalStart = startStop[1].substr(0,19);
+			var globalStop = startStop[1].substr(20);
+			
+			this.set('globalStart', globalStart);
+			this.set('globalStop', globalStop);
+			
+			if (res.mask)
+				this.set('linkedMask', res.mask);
+			if (res.size) 
+				this.set('size', res.size);
+		}
+		
+		if (res.isSpectra) {
+			this.set('iconCls', 'icon-spectra');
+		} 
+		else if (res.size == 3) {
+			this.set('iconCls', 'icon-vector');
+		}
+		else if (res.size > 1) {
+			this.set('iconCls', 'icon-unknowntype');
+		}
+		
+		// update my data on possible mask change		    
+		if (res.updateMyData) {
+			this.updateMyData();
+			this.updateMask(res.mask);
+		}
+	}
+
 });
@@ -266,10 +266,12 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 			model: 'amdaModel.AmdaNode',
 			sorters:[{ direction: 'ASC' ,
 						sorterFn: function(o1, o2){
-								if (o1.get('nodeType') !== 'localParam')
-										return;
-
-								return o1.get('text').toUpperCase()  < o2.get('text').toUpperCase() ? -1 : 1;
+							
+								if (o1.get('nodeType') == 'localParam' || o1.get('nodeType') == 'myData') {
+									return o1.get('text').toUpperCase()  < o2.get('text').toUpperCase() ? -1 : 1;
+								}
+								
+								return;
 							} 
 						}],
 			listeners: {
@@ -10,474 +10,495 @@
 Ext.define('amdaUI.MyDataUI', {
-        extend: 'Ext.container.Container',
-        alias: 'widget.panelMyData',
-        
-        requires: [
-                   'amdaUI.TableDefPlugUI'
-        ],
+	extend: 'Ext.container.Container',
+	alias: 'widget.panelMyData',
+	
+	requires: [
+			'amdaUI.TableDefPlugUI'
+	],
-        object : null,	
-        fileObject : null,
-        
-        module : null,
-        
-        fields : [],
-        columns : [],
-        
-        constructor: function(config) {	
-                this.module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);	   
-                this.init(config);
-                this.callParent(arguments);
-                this.setObject(this.module.linkedNode.get('object')); 
-        },
- 
-        /*
-        * linked node should be MyDataParamNode
-        */	 	
-        resetLinkedNode: function() 
-        {
-            this.linkedNode = null;	    		      
-            this.module.createLinkedNode();
-            this.module.createObject();
-            this.module.linkedNode.set('fileObject',this.fileObject); 
-        },
+	object : null,	
+	fileObject : null,
-        getObjectCallback: function(result,remoteEvent)
-        {
-            var t = remoteEvent.getTransaction();
-            if (result && !result.error) {   	         	      	      	     
-                //this.tmpNode.set('contextNode',mask!!! if exists	  
-                this.fileObject = Ext.create('amdaModel.FileObject', result);
-                var panelConfig = this.initPanel();
-            } 
-            else {	   
-                // EXCEPTION : parameter not found !
-                myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
-                    +this.tmpNode.get('text')+"' found!");	     
-            }	  
-        },
-		
-        /*
-        *  Update info in the form on another parameter selection (cdf, cef formats);
-        */
-        updateInfo : function(res, e) 
-        {	    
-            if (res.success){	   
-                // info panel	     
-                this.items.getAt(1).update(res.info.name+': '+res.info.type+' '+res.info.size+' '+res.info.n_records);	    
-                var form = this.items.getAt(0).getForm();
-            
-                //keep old name and mask if they exist 
-                if (this.object.get('format') == 'vot')
-                {
-                	if ((res.info.id === this.object.get('realvar'))) { 
-                		if (this.object.get('realvar') != this.object.get('name')) {
-                			res.info.name = this.object.get('name');
-                		}
-                		if (res.info.mask != this.object.get('mask')) {
-                			res.info.mask = this.object.get('mask');
-                		}
-                	}
-                }
-                else
-                {
-                	if ((res.info.name === this.object.get('realvar'))) { 
-                		if (this.object.get('realvar') != this.object.get('name')) {
-                			res.info.name = this.object.get('name');
-                		}
-                		if (res.info.mask != this.object.get('mask')) {
-                			res.info.mask = this.object.get('mask');
-                		}
-                	}
-                }
+	module : null,
+	
+	fields : [],
+	columns : [],
+	
+	constructor: function(config) {	
+				this.module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);	   
+				this.init(config);
+				this.callParent(arguments);
+				this.setObject(this.module.linkedNode.get('object'));
+	},
-             form.setValues(res.info);       
-            }
-            else {
-                myDesktopApp.errorMsg("System Error <br/> Error at AMDA Server");
-            }
-        },
-        
-        /*
-        * Check if changes were made before closing window 
-        * @return false
-        */	
-        fclose : function() {
-                return false;
-        },
+	/*
+	* linked node should be MyDataParamNode
+	*/	 	
+	resetLinkedNode: function() 
+	{
+		this.linkedNode = null;	    		      
+		this.module.createLinkedNode();
+		this.module.createObject();
+		this.module.linkedNode.set('fileObject',this.fileObject); 
+	},
-        /**
-        * set object into form
-        */
-        setObject : function (object) 
-        {
-        	// edit in module from  FileUpload Module and ExplorerModule (edit param)
-            if (this.module.linkedNode) { 
-                if (this.module.linkedNode.get('fileObject')) {		
-                    this.fileObject = this.module.linkedNode.get('fileObject');		  		       		    
-                } 
-            // edit in module from Explorer Module (edit file)
-                else if (this.module.linkedNode.get('object')) { 	 
-                    this.fileObject = this.module.linkedNode.get('object'); 
-                    this.resetLinkedNode();
-                }
-                else {	      
-                    myDesktopApp.errorMsg("System Error <br/> No FileObject and Object");
-                }	      
-            }	    
-            else {  
-                myDesktopApp.errorMsg("System Error <br/> No Linked Node"); 
-            }
-            
-            var form = this.down('form');
-            form.getForm().reset();
-            // remove and DESTROY right panel if it exists
-            if (form.items.length == 2) 
-                    form.remove(form.items.getAt(1),true);
-            // create right panel depending on file	  
-            var rightPanel = this.initPanel();
-            form.add(rightPanel);
-            this.object = this.module.linkedNode.get('object'); 
+	getObjectCallback: function(result,remoteEvent)
+	{
+		var t = remoteEvent.getTransaction();
+		if (result && !result.error) {   	         	      	      	     
+				//this.tmpNode.set('contextNode',mask!!! if exists	  
+				this.fileObject = Ext.create('amdaModel.FileObject', result);
+				var panelConfig = this.initPanel();
+		} 
+		else {	   
+				// EXCEPTION : parameter not found !
+				myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
+					+this.tmpNode.get('text')+"' found!");	     
+		}  
+	},
+	/*
+	*  Update info in the form on another parameter selection (cdf, cef formats);
+	*/
+	updateInfo : function(res, e) 
+	{	    
+		if (res.success){ 
+				// info panel     
+				this.items.getAt(1).update(res.info.name+': '+res.info.type+' '+res.info.size+' '+res.info.n_records);	    
+				var form = this.items.getAt(0).getForm();
+		
+				//keep old name and mask if they exist 
+				if (this.object.get('format') == 'vot')
+				{
+				res.info.ytitle = res.info.name;
+				if ((res.info.id === this.object.get('realvar'))) { 
+					if (this.object.get('realvar') != this.object.get('name')) {
+						res.info.name = this.object.get('name');
+					}
+					if (res.info.mask != this.object.get('mask')) {
+						res.info.mask = this.object.get('mask');
+					}
+				}
+				}
+				else
+				{
+				if ((res.info.name === this.object.get('realvar'))) { 
+					if (this.object.get('realvar') != this.object.get('name')) {
+						res.info.name = this.object.get('name');
+					}
+					if (res.info.mask != this.object.get('mask')) {
+						res.info.mask = this.object.get('mask');
+					}
+				}
+				res.info.ytitle = res.info.name;
+				}
-            // load object into form
-            if (object.$className == 'amdaModel.FileObject' || !this.object.get('name'))
-                    form.getForm().loadRecord(this.fileObject);
-            else
-                    form.getForm().loadRecord(this.object);
+			form.setValues(res.info);       
+		}
+		else {
+				myDesktopApp.errorMsg("System Error <br/> Error at AMDA Server");
+		}
+	},        
+	/*
+	* Check if changes were made before closing window 
+	* @return false
+	*/	
+	fclose : function() {
+				return false;
+	},
+	
+	/**
+	* set object into form
+	*/
+	setObject : function (object) 
+	{
+		// edit in module from  FileUpload Module and ExplorerModule (edit param)
+		if (this.module.linkedNode) { 
+				if (this.module.linkedNode.get('fileObject')) {		
+					this.fileObject = this.module.linkedNode.get('fileObject');
+				} 
+				// edit in module from Explorer Module (edit file)
+				else if (this.module.linkedNode.get('object')) { 					
+					this.fileObject = this.module.linkedNode.get('object');	
+					this.resetLinkedNode();
+				}
+				else {	      
+					myDesktopApp.errorMsg("System Error <br/> No FileObject and Object");
+				}	      
+		}	    
+		else {  
+				myDesktopApp.errorMsg("System Error <br/> No Linked Node"); 
+		}
+		
+		var form = this.down('form');
+		form.getForm().reset();
+		// remove and DESTROY right panel if it exists
+		if (form.items.length == 2) 
+					form.remove(form.items.getAt(1),true);
+		// create right panel depending on file	  
+		var rightPanel = this.initPanel();
+		form.add(rightPanel);
+		this.object = this.module.linkedNode.get('object'); 
-            // if it is not newly created empty myParamData node	  
-            if (this.object.get('name')) {
-                // file panel work around	   
-                if (this.fileObject.get('format') == 'txt') {    		 
-                    form.getForm().findField('start').setValue(this.object.get('realvar'));		 
-                }
-                else if (this.object.get('format') == 'vot')
-                {
-                    var radio = this.down('radiogroup');
-                    radio.setValue({'votvar' : this.object.get('realvar')});
-                }
-                else { // cdf, cef, nc
-                // select parameter
-                    var radio = this.down('radiogroup'); 		
-                    radio.setValue({'cdfvar' : this.object.get('realvar')});                  
-                }
-            }
-            
-            //Set table definition
-            if (object.get('tableDef'))
-            	this.getPlugin('tabledef').setTableDefinition(object.get('tableDef'));
-        },
+		// load object into form
+		if (object.$className == 'amdaModel.FileObject' || !this.object.get('name')) {
+					form.getForm().loadRecord(this.fileObject);
+					if (this.fileObject.get('format') == 'txt')
+							this.disablePredefined(false);
+					else
+							this.disablePredefined(true);
+		}
+		else
+					form.getForm().loadRecord(this.object);
-/*
- *  highlight selected columns in case of param (ASCII) edit
- */
-        updateSelection: function()
-        {                    
-            var start = parseInt(this.object.get('realvar'));
-            var size =  parseInt(this.object.get('size'));
-            
-            if (start && size) {
-                var columns = this.down('gridpanel').columns;
-                for (var i = start; i < start+size; i++) {	   
-                    var selected = Ext.select(columns[i].getCellSelector(i));
-                    selected.addCls('meow');
-                    columns[i].selected = true;
-                }
-            }
-        },
+		// if it is not newly created empty myParamData node	  
+		if (this.object.get('name')) {
+				// file panel work around	   
+				if (this.fileObject.get('format') == 'txt') {    		 
+					form.getForm().findField('start').setValue(this.object.get('realvar'));	
+					this.disablePredefined(false);	 
+				}
+				else if (this.object.get('format') == 'vot')
+				{
+					var radio = this.down('radiogroup');
+					radio.setValue({'votvar' : this.object.get('realvar')});
+				}
+				else { // cdf, cef, nc
+					// select parameter
+					var radio = this.down('radiogroup');
+					radio.suspendEvent('change');
+					radio.setValue({'cdfvar' : this.object.get('realvar')}); 
+					radio.resumeEvent('change');
+					// disable form fields defined in file
+					this.disablePredefined(true);
+				}
+		}
+		
+		//Set table definition
+		if (object.get('tableDef'))
+			this.getPlugin('tabledef').setTableDefinition(object.get('tableDef'));
+	},
-        /*
-        * update this.object from form
-        */
-        updateObject : function(nameField)
-        {    
-            // get the basic form
-            var basicForm =  this.down('form').getForm();	  
-            var updateStatus = true;
-            var fieldsWithoutName = basicForm.getFields().items;
-            
-            Ext.Array.each(fieldsWithoutName, function(item, index,allItems){
-                if(item !== nameField) { 		     
-                    if (!item.isValid()) {
-                        // set update isn't allowed
-                        updateStatus = false;    
-                    }
-                }
-            }, this);
-            
-            // if the update is allowed
-            if (updateStatus) {
-                // real object update
-                // updateobject with the content of form
-                var values = basicForm.getValues(); 
-                basicForm.updateRecord(this.object);
-                this.object.set('file',this.fileObject.get('fileName')); 
-                this.object.set('format', this.fileObject.get('format'));
-                if (this.object.get('format') == 'cdf' || this.object.get('format') == 'cef' || this.object.get('format') == 'nc') this.object.set('realvar',values.cdfvar);
-                if (this.object.get('format') == 'vot') this.object.set('realvar',values.votvar);
-                if (this.object.get('format') == 'txt') this.object.set('realvar',values.start);
-                this.object.set('tableDef', this.getPlugin('tabledef').getTableDefinitionObject());
-            }
-            // return the update status
-            return updateStatus;	    
-        },
+	/*
+	*   // disable form fields defined in file ( cdf, nc, cef ) 
+	*/	
+	disablePredefined: function(disable)
+	{
+		var form = this.down('form');
+		form.getForm().findField('start').setDisabled(disable);
+		form.getForm().findField('size').setReadOnly(disable);
+		this.down('combobox').setReadOnly(disable);
+	},
+	
+	/*
+	*  highlight selected columns in case of param (ASCII) edit
+	*/
+	updateSelection: function()
+	{                    
+		var start = parseInt(this.object.get('realvar'));
+		var size =  parseInt(this.object.get('size'));
+		
+		if (start && size) {
+				var columns = this.down('gridpanel').columns;
+				for (var i = start; i < start+size; i++) {	   
+					var selected = Ext.select(columns[i].getCellSelector(i));
+					selected.addCls('meow');
+					columns[i].selected = true;
+				}
+		}
+	},
+
+	/*
+	* update this.object from form
+	*/
+	updateObject : function(nameField)
+	{    
+		// get the basic form
+		var basicForm =  this.down('form').getForm();	  
+		var updateStatus = true;
+		var fieldsWithoutName = basicForm.getFields().items;
+		
+		Ext.Array.each(fieldsWithoutName, function(item, index,allItems){
+				if(item !== nameField) { 		     
+					if (!item.isValid()) {
+						// set update isn't allowed
+						updateStatus = false;    
+					}
+				}
+		}, this);
+		
+		// if the update is allowed
+		if (updateStatus) {
+				// real object update
+				// updateobject with the content of form
+				var values = basicForm.getValues(); 
+				basicForm.updateRecord(this.object);
+				this.object.set('file',this.fileObject.get('fileName')); 
+				this.object.set('format', this.fileObject.get('format'));
+				if (this.object.get('format') == 'cdf' || this.object.get('format') == 'cef' || this.object.get('format') == 'nc') this.object.set('realvar',values.cdfvar);
+				if (this.object.get('format') == 'vot') this.object.set('realvar',values.votvar);
+				if (this.object.get('format') == 'txt') this.object.set('realvar',values.start);
+				this.object.set('tableDef', this.getPlugin('tabledef').getTableDefinitionObject());
+		}
+		// return the update status
+		return updateStatus;	    
+	},
-        /**
-         * Check mask - length, existed....
-         * @return true/false
-         */     
-         validateMask : function(value)
-         {
-            // length
-            if (value.length < 6) return 'mask length is too small (< 6)';
- 
-            // first *
-            if (value.indexOf('*') === 0)  return '"*" could not be the first letter in mask';
-           
-            // several *
-            if (value.indexOf('*') !== value.lastIndexOf('*')) return 'several "*" are not allowed in mask';
-           
-            // less common            
-            var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id); 
-            var oldmask = paramModule.linkedNode.get('object').get('mask');
-            // no old mask
-            if (oldmask.length === 0) return true;
-            if (value.length > oldmask.length) return 'new mask is less common than old one';
-           
-           return true;
-        },
+	/**
+	* Check mask - length, existed....
+	* @return true/false
+	*/     
+	validateMask : function(value)
+	{
+		// length
+		if (value.length < 6) return 'mask length is too small (< 6)';
-        /*
-         * 
-         */        
-        saveProcess : function(toRename)
-        {          
-            var values = this.down('form').getForm().getValues();              	 
-            // Parameter Module
-            var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);   
-             
-            // if the name has been modified this is a creation
-            if (this.object.isModified('name')){                
-                    var contextNode = paramModule.linkedNode.parentNode;        
-                    // if object already has an id : it's a 'rename' of an existing  	
-                    if (this.object.get('id')){
-                        // get file object of the first node linked this file
-                        var fileObject = paramModule.linkedNode.get('fileObject');
-                        
-                        paramModule.createLinkedNode();                         
-                        // create a new object linked	                      
-                        var paramobj = Ext.create(paramModule.linkedNode.get('objectDataModel'), values);
-                            
-                        paramobj.set('format', this.fileObject.get('format'));                   
-                        if (paramobj.get('format') == 'cdf' || paramobj.get('format') == 'cef' ||
-                            paramobj.get('format') == 'nc')
-                                                    paramobj.set('realvar',values.cdfvar);
-                        if (paramobj.get('format') == 'vot') 
-                                                    paramobj.set('realvar',values.votvar);
-                        if (paramobj.get('format') == 'txt') 
-                                                    paramobj.set('realvar',values.start);
- 
-                        paramobj.set('file', this.fileObject.get('fileName'));
-                        
-                        paramobj.set('tableDef', this.getPlugin('tabledef').getTableDefinitionObject());
-            
-                        paramModule.linkedNode.set('object',paramobj);
-                        //synchronize objects
-                        this.object = paramobj; 
-                        
-                        paramModule.linkedNode.set('fileObject',fileObject);
-                        
-                        if (toRename) 
-                                    paramModule.linkedNode.toRename = true;
-                    }
-                    paramModule.linkedNode.set('contextNode',contextNode);                 
-                    paramModule.linkedNode.create();
-                
-                    paramModule.linkedNode.set('isParameter', true);
-                    
-                    if (values.size == 1) {
-                                paramModule.linkedNode.set('iconCls', 'icon-scalar');  
-                                paramModule.linkedNode.set('isSpectra', false);
-                    }
-                    else {
-                        if (values.plottype == 'Spectra') {
-                                paramModule.linkedNode.set('isSpectra', true);
-                                paramModule.linkedNode.set('iconCls', 'icon-spectra'); 
-                        }
-                        else {
-                                paramModule.linkedNode.set('iconCls', 'icon-unknowntype'); 
-                                paramModule.linkedNode.set('isSpectra', false);
-                            }
-                    }                                        
-           
-                } else {  		  
-                    paramModule.linkedNode.set('contextNode',paramModule.contextNode); 
-                    paramModule.linkedNode.update();		  
-                }                  
-            }, 
+		// first *
+		if (value.indexOf('*') === 0)  return '"*" could not be the first letter in mask';
+		
+		// several *
+		if (value.indexOf('*') !== value.lastIndexOf('*')) return 'several "*" are not allowed in mask';
+		
+		// less common            
+		var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id); 
+		var oldmask = paramModule.linkedNode.get('object').get('mask');
+		// no old mask
+		if (oldmask.length === 0) return true;
+		if (value.length > oldmask.length) return 'new mask is less common than old one';
+		
+		return true;
+	},
+
+	/*
+	*  save parameter
+	*/        
+	saveProcess : function(toRename)
+	{          
+		var values = this.down('form').getForm().getValues();              	 
+		// Parameter Module
+		var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);   
+			
+		// if the name has been modified this is a creation
+		if (this.object.isModified('name'))
+		{                
+			var contextNode = paramModule.linkedNode.parentNode;        
+			// if object already has an id : it's a 'rename' of an existing  	
+			if (this.object.get('id'))
+			{
+				// get file object of the first node linked this file
+				var fileObject = paramModule.linkedNode.get('fileObject');
+				
+				paramModule.createLinkedNode();                         
+				// create a new object linked	                      
+				var paramobj = Ext.create(paramModule.linkedNode.get('objectDataModel'), values);
+							
+				paramobj.set('format', this.fileObject.get('format'));                   
+				if (paramobj.get('format') == 'cdf' || paramobj.get('format') == 'cef' ||
+						paramobj.get('format') == 'nc')
+														paramobj.set('realvar',values.cdfvar);
+				if (paramobj.get('format') == 'vot') 
+														paramobj.set('realvar',values.votvar);
+				if (paramobj.get('format') == 'txt') 
+														paramobj.set('realvar',values.start);
+
+				paramobj.set('file', this.fileObject.get('fileName'));
+				
+				paramobj.set('tableDef', this.getPlugin('tabledef').getTableDefinitionObject());
+
+				paramModule.linkedNode.set('object',paramobj);
+				//synchronize objects
+				this.object = paramobj; 
+				
+				paramModule.linkedNode.set('fileObject',fileObject);
+				
+				if (toRename) 
+								paramModule.linkedNode.toRename = true;
+			}
+			paramModule.linkedNode.set('contextNode',contextNode);                 
+			paramModule.linkedNode.create();
+		
+			paramModule.linkedNode.set('isParameter', true);
+			
+			if (values.size == 1) {
+							paramModule.linkedNode.set('iconCls', 'icon-scalar');  
+							paramModule.linkedNode.set('isSpectra', false);
+			}
+			else if (values.size == 3) {
+							paramModule.linkedNode.set('iconCls', 'icon-vector');  
+							paramModule.linkedNode.set('isSpectra', false);
+			}
+			else {
+				if (values.plottype == 'Spectra') {
+							paramModule.linkedNode.set('isSpectra', true);
+							paramModule.linkedNode.set('iconCls', 'icon-spectra'); 
+				}
+				else {
+							paramModule.linkedNode.set('iconCls', 'icon-unknowntype'); 
+							paramModule.linkedNode.set('isSpectra', false);
+						}
+			}                                                   
+		} else {  		  
+			paramModule.linkedNode.set('contextNode',paramModule.contextNode); 
+			paramModule.linkedNode.update();		  
+		}                  
+	}, 
-            /* 
-            *       overwrite method called by Save button
-            */
-            overwriteProcess : function(btn){
-                if (btn == 'cancel') return;
-                var basicForm = this.down('form').getForm();
-                basicForm.clearInvalid();
-                this.saveProcess(true);        
-            },
-	
-            updateForm : function() {
-                var basicForm = this.down('form').getForm();
-                var columns = this.down('gridpanel').columns;
-                
-                var start;
-                var size = 0;
-                Ext.Array.each(columns, function(column,index){
-                    if (!start && column.selected) start = index;
-                    if (column.selected) size += 1;
-                });
-                
-                basicForm.setValues({start: start, size : size});
-            },
+	/* 
+	*       overwrite method called by Save button
+	*/
+	overwriteProcess : function(btn){
+			if (btn == 'cancel') return;
+			var basicForm = this.down('form').getForm();
+			basicForm.clearInvalid();
+			this.saveProcess(true);        
+	},
+
+	updateForm : function() {
+			var basicForm = this.down('form').getForm();
+			var columns = this.down('gridpanel').columns;
+			
+			var start;
+			var size = 0;
+			Ext.Array.each(columns, function(column,index){
+				if (!start && column.selected) start = index;
+				if (column.selected) size += 1;
+			});
+			
+			basicForm.setValues({start: start, size : size});
+	},
-        /*
-        *         Configurations 
-        * 
-        */     
-        initPanel : function() 
-        {
-            var format = this.fileObject.get('format');	  
-            if (format == 'cdf' || format == 'cef' || format == 'nc') return this.cdfPanel(format);
-            if (format == 'txt')  return this.txtPanel();
-            if (format == 'vot') return this.votPanel();
-        },
+	/*
+	*         Configurations 
+	* 
+	*/     
+	initPanel : function() 
+	{
+		var format = this.fileObject.get('format');	  
+		if (format == 'cdf' || format == 'cef' || format == 'nc') return this.cdfPanel(format);
+		if (format == 'txt')  return this.txtPanel();
+		if (format == 'vot') return this.votPanel();
+	},
+	
+	txtPanel: function() 
+	{	  
+		var fileName = this.fileObject.get('fileName');
-        txtPanel: function() 
-        {	  
-            var fileName = this.fileObject.get('fileName');
-            
-            //FOR INFO
-            // Null out built in convert functions for performance *because the raw data is known to be valid*
-            // Specifying defaultValue as undefined will also save code. 
-            // As long as there will always be values in the data, or the app tolerates undefined field values*
-            
-            // Dynamically created fields and columns	    
-            var n_col = this.fileObject.get('vars'); 
-            // reset	  
-            this.fields = [];
-            this.columns = [];
+		//FOR INFO
+		// Null out built in convert functions for performance *because the raw data is known to be valid*
+		// Specifying defaultValue as undefined will also save code. 
+		// As long as there will always be values in the data, or the app tolerates undefined field values*
+		
+		// Dynamically created fields and columns	    
+		var n_col = this.fileObject.get('vars'); 
+		// reset	  
+		this.fields = [];
+		this.columns = [];
-            for (var i = 0; i < n_col; i++){    
-                var name = i === 0 ? 'Time' : 'n'+i;
-                //TODO width dependent on data?	  
-                var width = i === 0 ? 120 : 75;
-                
-                this.fields[i] = { name: name };
-                this.columns[i] = { text: name, sortable : false,  dataIndex: name, width : width, 
-                                    menuDisabled: true, selected : false,
-                                    listeners: {
-                                        scope : this,
-                                        headerclick: function(ct, column){
-                                        if (column.text != 'Time') {
-                                            var selected = Ext.select(column.getCellSelector(1));
-                                            if (column.selected) {				      
-                                                selected.removeCls('meow');
-                                                column.selected = false;
-                                            }
-                                            else {
-                                            selected.addCls('meow');
-                                            column.selected = true;
-                                            }
-                                            this.updateForm();
-                                        }
-                                        }
-                                    }
-                };  
-            }
-            
-            // Dynamically created model	  
-            Ext.define('myData', {
-                extend: 'Ext.data.Model',
-                fields: this.fields,
-                idProperty: 'Time' 
-            });
-            
-            var store = Ext.create('Ext.data.ArrayStore', {
-                model: 'myData',
-                autoLoad: true,
-                proxy: {
-                type: 'direct',
-                directFn: AmdaAction.getAsciiFile		   
-                },
-                listeners: {
-                    scope: this,
-                    beforeload: function(store){
-                        store.proxy.extraParams = {
-                        fileName: this.fileObject.get('fileName') 
-                        };
-                    },
-                    load: function(store, records, successful, eOpts) {
-                        this.updateSelection();
-                    }
-                }
-            });
+		for (var i = 0; i < n_col; i++)
+		{    
+			var name = i === 0 ? 'Time' : 'n'+i;
+			//TODO width dependent on data?	  
+			var width = i === 0 ? 120 : 75;
+			
+			this.fields[i] = { name: name };
+			this.columns[i] = { text: name, sortable : false,  dataIndex: name, width : width, 
+				menuDisabled: true, selected : false,
+				listeners: 
+				{
+					scope : this,
+					headerclick: function(ct, column)
+					{
+						if (column.text != 'Time') {
+							var selected = Ext.select(column.getCellSelector(1));
+							if (column.selected) {				      
+								selected.removeCls('meow');
+								column.selected = false;
+							}
+							else {
+								selected.addCls('meow');
+								column.selected = true;
+							}
+							this.updateForm();
+						}
+					}
+				}
+			};  
+		}
+			
+		// Dynamically created model	  
+		Ext.define('myData', {
+				extend: 'Ext.data.Model',
+				fields: this.fields,
+				idProperty: 'Time' 
+		});
+		
+		var store = Ext.create('Ext.data.ArrayStore', {
+				model: 'myData',
+				autoLoad: true,
+				proxy: {
+				type: 'direct',
+				directFn: AmdaAction.getAsciiFile		   
+				},
+				listeners: {
+					scope: this,
+					beforeload: function(store){
+						store.proxy.extraParams = {
+						fileName: this.fileObject.get('fileName') 
+						};
+					},
+					load: function(store, records, successful, eOpts) {
+						this.updateSelection();
+					}
+				}
+		});
-            // Dynamically created columns dependent of myData model
-            var panelConfig = {
-                xtype : 'gridpanel',
-                store : store,
-                title : fileName,
-                height: '100%',
-                flex : 2,
-                columnLines: true,
-                columns: this.columns,
-                listeners: {
-                    scope : this,
-                    cellclick: function(view,td,cellIndex,record,tr,rowIndex,e){
-                        var column = view.getGridColumns()[cellIndex];
-                        if (cellIndex > 0) {
-                            var selected = Ext.select(column.getCellSelector(cellIndex));
-                            if (column.selected) {
-                                selected.removeCls('meow');
-                                column.selected = false;			  
-                            }
-                            else {
-                                selected.addCls('meow');
-                                column.selected = true;
-                            }
-                            this.updateForm();
-                        }
-                    },
-                    select: function(selmodel, record, index, e) {
-                        selmodel.deselectAll();
-                    }	
-                }
-            };
+		// Dynamically created columns dependent of myData model
+		var panelConfig = {
+				xtype : 'gridpanel',
+				store : store,
+				title : fileName,
+				height: '100%',
+				flex : 2,
+				columnLines: true,
+				columns: this.columns,
+				listeners: 
+				{
+					scope : this,
+					cellclick: function(view,td,cellIndex,record,tr,rowIndex,e)
+					{
+						var column = view.getGridColumns()[cellIndex];
+						if (cellIndex > 0) {
+								var selected = Ext.select(column.getCellSelector(cellIndex));
+								if (column.selected) {
+									selected.removeCls('meow');
+									column.selected = false;			  
+								}
+								else {
+									selected.addCls('meow');
+									column.selected = true;
+								}
+								this.updateForm();
+						}
+					},
+					select: function(selmodel, record, index, e) {
+						selmodel.deselectAll();
+					}	
+				}
+		};
-            return panelConfig;
-        },
+		return panelConfig;
+	},
-        cdfPanel : function(format) {
-            
-            var vars = this.fileObject.get('vars');
-            var fileName = this.fileObject.get('fileName'); 
-            var items = [];	   
-            Ext.Array.each(vars, function(name, index) {
-                if (name) {
-                    items[index] = { boxLabel: name, name: 'cdfvar',  inputValue: name,
-                                    listeners: {
-                                        scope: this,
-                                        change: function (cb, nv, ov) {					     
-                                            if (nv) {                                             
-                                                AmdaAction.getMyParamInfo({format: format, file : fileName, varName : cb.inputValue},						
-                                                this.updateInfo, this);                                          
-                                            }					   							 						  
-                                        }
-                                    }
-                    }
-                }
-            }, this);
+	cdfPanel : function(format) 
+	{
+		var vars = this.fileObject.get('vars');
+		var fileName = this.fileObject.get('fileName'); 
+		var items = [];	   
+		Ext.Array.each(vars, function(name, index) {
+				if (name) {
+					items[index] = { boxLabel: name, name: 'cdfvar', inputValue: name }	
+				}
+		}, this);
 		var panelConfig = {
 			xtype : 'fieldset', 
@@ -491,39 +512,49 @@ Ext.define(&#39;amdaUI.MyDataUI&#39;, {
 				cls: 'x-check-group-alt',
 				columns: 2,
 				vertical: true,	                     
-				items: items
+				items: items, 
+				listeners : {
+					scope: this,
+					change: function (cb, nv, ov) {
+						if (nv.cdfvar) { 
+							AmdaAction.getMyParamInfo({format: format, file : fileName, varName : nv.cdfvar},
+							this.updateInfo, this);
+						}  
+					}
+				}
 			}]
 		};
 		return panelConfig;
 	},
-        votPanel : function() 
-        {                    
-                var vars = this.fileObject.get('vars');
-                var fileName = this.fileObject.get('fileName');
-                
-                var items = [];	  
-                
-                if (this.fileObject.get('foundTime'))
-                {
-                        Ext.Array.each(vars, function(obj, index) {
-                                items[index] = { boxLabel: obj.name, name: 'votvar',  inputValue: obj.id,
-                                                listeners: {
-                                        scope: this,
-                                        change: function (cb, nv, ov) {					     
-                                                if (nv) {						
-                                                AmdaAction.getMyParamInfo({format: 'vot', file : fileName, varName : cb.inputValue},						
-                                                    this.updateInfo, this); 
-                                            }					   							 						  
-                                        }
-                                    }
-                        };
-                    }, this);
-                }
-                else
-                        myDesktopApp.errorMsg("Cannot find a valid time field!");	       
-                    
+	votPanel : function() 
+	{                    
+		var vars = this.fileObject.get('vars');
+		var fileName = this.fileObject.get('fileName');
+		
+		var items = [];	  
+		
+		if (this.fileObject.get('foundTime'))
+		{
+				Ext.Array.each(vars, function(obj, index) {
+					items[index] = { boxLabel: obj.name, name: 'votvar',  inputValue: obj.id,
+						listeners: 
+						{
+							scope: this,
+							change: function (cb, nv, ov) {					     
+									if (nv) {						
+									AmdaAction.getMyParamInfo({format: 'vot', file : fileName, varName : cb.inputValue},						
+											this.updateInfo, this); 
+								}					   							 						  
+							}
+						}
+				};
+			}, this);
+		}
+		else
+				myDesktopApp.errorMsg("Cannot find a valid time field!");	       
+						
 		var panelConfig = {
 			xtype : 'fieldset', 
 			bodyStyle: { background : '#dfe8f6'},
@@ -555,305 +586,314 @@ Ext.define(&#39;amdaUI.MyDataUI&#39;, {
 			]
 		}); 
-            var combo =   { 
-                xtype: 'combo',
-                fieldLabel: 'Parameter Data Type',
-                store: store,
-                queryMode: 'local',
-                displayField: 'name',
-                valueField: 'value',
-                name: 'type',		
-                editable: false,
-                value: 'FLOAT'
-            };
+		var combo =   { 
+				xtype: 'combo',
+				fieldLabel: 'Parameter Data Type',
+				store: store,
+				queryMode: 'local',
+				displayField: 'name',
+				valueField: 'value',
+				name: 'type',		
+				editable: false,
+				value: 'FLOAT'
+		};
-	    var store1 = Ext.create('Ext.data.Store', {
-                fields: ['value', 'name'],
-                data : [
-                    {"value": "TimeSerie", "name":"Time Serie"},                   
-                    {"value": "Spectra", "name":"Spectra"}
-                ]
-            }); 
+		var store1 = Ext.create('Ext.data.Store', {
+					fields: ['value', 'name'],
+					data : [
+						{"value": "TimeSerie", "name":"Time Serie"},                   
+						{"value": "Spectra", "name":"Spectra"}
+					]
+		}); 
-            var comboPlotType =   { 
-                xtype: 'combo',
-                fieldLabel: 'Display Type',
-                store: store1,
-                queryMode: 'local',
-                displayField: 'name',
-                valueField: 'value',
-                name: 'plottype',           
-                editable: false,
-                value: 'Time Series'
-            };
-            
-            var notTxt = false; //this.fileObject.get('format') !== 'txt';
-            //  var maxSize = notTxt? 100 : this.columns.length - 1;
-	  
-        // Parameter Form	  
-            var panelLeft =  {
-                bodyStyle: { background : '#dfe8f6'},	      
-                flex : 1,	 
-                defaults: {
-                    xtype:'textfield',
-                    validateOnChange: false,
-                    validateOnBlur: false,
-                    padding : '0 10 0 5',
-                    inputWidth : 80
-                },
-                items: [
-                {
-                    id: 'mydataName',
-                    fieldLabel: 'Parameter Name',
-                    labelAlign: 'top',
-                    name: 'name',
-                    allowBlank : false,
-                    stripCharsRe: /(^\s+|\s+$)/g,
-                    validFlag: false,
-    	            validator : function() {
-    	            	return this.validFlag;
-    	            },
-                    inputWidth : 180
-                }, {
-                    fieldLabel: 'File Name/Mask&nbsp;<img amda_clicktip="fileMask" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', 
-                    labelAlign: 'top',             
-                    name: 'mask',
-                    inputWidth : 180,
-                    validator : this.validateMask
-                }, combo, {
-                    xtype:'numberfield',
-                    fieldLabel: 'Parameter Start Position',              
-                    name: 'start',
-                    disabled: notTxt,
-                    minValue : 1,
-        //	  maxValue : maxSize,
-                    listeners : {
-                        scope : this,
-                        change : function(field, newValue, oldValue){
-                            var grid = this.down('gridpanel');
-                            if (!grid) return;
-                            if (newValue && newValue != oldValue) {
-                            var size = field.prev().value;
-                            var columns = grid.columns;
-                            Ext.Array.each(columns, function(column,index){
-                                var selected = Ext.select(column.getCellSelector(index));
-                                if (index < newValue){
-                                if (column.selected) {
-                                    selected.removeCls('meow');
-                                    column.selected = false;				 
-                                }
-                            }
-                            else if (index == newValue) {
-                                if (!column.selected) {
-                                    selected.addCls('meow');
-                                    column.selected = true;				 
-                                }
-                            }
-                            else {
-                                if (column.selected) {
-                                    selected.removeCls('meow');
-                                    column.selected = false;				 
-                                } 
-                            }
-                            });
-                            }
-                        }
-                    }
-                }, { 
-                    xtype:'numberfield',
-                    fieldLabel: 'Parameter Size',              
-                    name: 'size',
-                    minValue: 1,
-        //	  maxValue : maxSize,
-                    disabled: notTxt,
-                    listeners : {
-                        scope : this,
-                        change : function(field, newValue, oldValue){
-                            var grid =  this.down('gridpanel');
-                            if (!grid) return;
-                            var start =  field.prev().value;
-                            var columns = grid.columns;
-                            Ext.Array.each(columns, function(column,index){
-                                var selected = Ext.select(column.getCellSelector(index));
-                                if (index <= start) {}
-                                else if (index - start < newValue) {
-                                if (!column.selected){
-                                    selected.addCls('meow');
-                                    column.selected = true;	
-                                }
-                                }
-                                else {
-                                    if (column.selected){
-                                    selected.removeCls('meow');
-                                    column.selected = false;	
-                                }
-                                }
-                            });
-                        }
-                    }
-                }, {
-                    xtype:'numberfield',
-                    fieldLabel: 'Min Sampling',              
-                    name: 'minsampling'//,
-                //  disabled: notTxt
-                },{
-                    xtype:'numberfield',
-                    fieldLabel: 'Max Sampling',              
-                    name: 'maxsampling'//,
-                    // disabled: notTxt
-                },{
-                    fieldLabel: 'Filling Value',              
-                    name: 'fillvalue'
-                },{
-                    fieldLabel: 'Units',              
-                    name: 'units'
-                },  comboPlotType, {
-                    fieldLabel: 'Y Title',              
-                    name: 'ytitle'
-                },{
-                    fieldLabel: 'Legend',              
-                    name: 'legend'
-                }                  
-                ],
-                listeners: {
-                            click: {
-                                element: 'el',
-                                fn: function(e,t) {	 		 
-                                    var me = t,
-                                        text = me.getAttribute('amda_clicktip');
-                                        if (text) {
-                                                e.preventDefault();
-                                                AmdaAction.getInfo({name : text}, function(res,e) {					    					   
-                                                            if (res.success) myDesktopApp.infoMsg(res.result);
-                                                }); 
-                                        }
-                                    }
-                            }			
-                        }
-            };
-	    
-            var myConf = {
-                layout: 'border',		 
-                items: [ {		   
-                        xtype : 'form',
-                        bodyStyle: { background : '#dfe8f6'},
-                        layout: 'hbox',   
-                        region: 'center',
-                        buttonAlign:'left',
-                        items : [
-                            panelLeft 
-                        ],					
-                        buttons: [
-                        {
-                        	scope : this,								 							  
-                            text: 'Show/Hide Table definition',								   
-                            handler: function() 
-                            {
-                            	this.getPlugin('tabledef').showHide();
-                            }
-                        },
-                        '->',
-                        {  
-                            scope : this,								 							  
-                            text: 'Save',								   
-                            handler: function() 
-                            {			     
-                                var form = this.down('form').getForm();			     
-                                // check if variable was selected
-                                // cdf,...
-                                var radio = this.down('radiogroup');            
-                                if (radio && radio.getChecked().length == 0) {
-                                    myDesktopApp.warningMsg('Select variable from the file, please');
-                                    return;
-                                }
-                                // ascii
-                                if (!radio && this.columns.length > 0) {                                  
-                                    if (!form.findField('start').getValue() || !form.findField('size').getValue()) {                                    
-                                    myDesktopApp.warningMsg('Select column[s] from the file, please');
-                                    return;
-                                    }                                  
-                                }
-                                var nameField = form.findField('mydataName'); 
-                                if (this.updateObject(nameField))
-                                {
-                                	var myDataModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);	
-      							  	if (!myDataModule)
-      								  return;
-                                	var me = this;
-                                	myDataModule.linkedNode.isValidName(nameField.getValue(), function (res) {
-                                		if (!res)
-      								  	{
-                                			nameField.validFlag = 'Error during object validation';
-      									  	myDesktopApp.errorMsg(nameField.validFlag);
-      									  	nameField.validate();
-      									  	return;
-      								  	}
-      								  
-      								  	if (!res.valid)
-      								  	{
-      								  		if (res.error)
-      								  		{
-      								  			if (res.error.search('subtree') != -1) {  							
-      								  				Ext.MessageBox.show({title:'Warning', 
-      								  					msg: res.error+'<br/>Do you want to overwrite it?',
-      													width: 300,
-      													buttons: Ext.MessageBox.OKCANCEL, 
-      													fn : me.overwriteProcess,
-      													icon: Ext.MessageBox.WARNING,
-      													scope : me
-      								  				});
-      								  				nameField.validFlag = true;
-      								  			}
-      								  			else
-      								  				nameField.validFlag = res.error;
-      								  		}
-      								  		else
-      								  		{
-      								  			nameField.validFlag = 'Invalid object name';
-      								  			myDesktopApp.errorMsg(nameField.validFlag);
-      								  		}
-      								  		nameField.validate();
-      								  		return;
-      								  	}
-      								  
-      								  	nameField.validFlag = true;
-      								  	nameField.validate();
-      								  	me.saveProcess();
-                                	});
-                                }
-                            }
-                        },{
-                            scope : this,
-                            text: 'Reset',
-                            handler: function(){				      
-                                this.down('form').getForm().reset();
-                            }
-                        }]
-                    },{
-                        xtype: 'panel', 
-                        region: 'south',
-                        title: 'Information',
-                        collapsible: true,
-                        collapseMode: 'header',
-                        height: 100,
-                        autoHide: false,
-                        iconCls: 'icon-information',
-                        bodyStyle: 'padding:5px',
-                        loader: {
-                            autoLoad: true,
-                            url: helpDir+'myDataHOWTO'
-                        }  
-                    }
-                ],
-                plugins: [ {ptype: 'tabledef', pluginId: 'tabledef'} ]
-            };
-        
-            Ext.apply (this, Ext.apply(arguments, myConf));
-        },
-        
-        getParameterSize : function()
-        {
-        	var form = this.down('form').getForm();
-        	return form.findField('size').getValue();
-        }
+		var comboPlotType =   { 
+				xtype: 'combo',
+				fieldLabel: 'Display Type',
+				store: store1,
+				queryMode: 'local',
+				displayField: 'name',
+				valueField: 'value',
+				name: 'plottype',           
+				editable: false,
+				value: 'Time Series'
+		};
+	
+	// Parameter Form	  
+		var panelLeft =  {
+			bodyStyle: { background : '#dfe8f6'},	      
+			flex : 1,	 
+			defaults: {
+				xtype:'textfield',
+				validateOnChange: false,
+				validateOnBlur: false,
+				padding : '0 10 0 5',
+				inputWidth : 80
+			},
+			items: [
+			{
+				id: 'mydataName',
+				fieldLabel: 'Parameter Name',
+				labelAlign: 'top',
+				name: 'name',
+				allowBlank : false,
+				stripCharsRe: /(^\s+|\s+$)/g,
+				validFlag: false,
+				validator : function() {
+					return this.validFlag;
+				},
+				inputWidth : 180
+			}, 
+			{
+				fieldLabel: 'File Name/Mask&nbsp;<img amda_clicktip="fileMask" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', 
+				labelAlign: 'top',             
+				name: 'mask',
+				inputWidth : 180,
+				validator : this.validateMask
+			}, 
+			combo, 
+			{
+				xtype:'numberfield',
+				fieldLabel: 'Parameter Start Position',              
+				name: 'start',
+				minValue : 1,
+				//	  maxValue : maxSize,
+				listeners : 
+				{
+					scope : this,
+					change : function(field, newValue, oldValue){
+						var grid = this.down('gridpanel');
+						if (!grid) return;
+						if (newValue && newValue != oldValue) 
+						{
+							var size = field.prev().value;
+							var columns = grid.columns;
+							Ext.Array.each(columns, function(column,index){
+								var selected = Ext.select(column.getCellSelector(index));
+								if (index < newValue)
+								{
+									if (column.selected) {
+										selected.removeCls('meow');
+										column.selected = false;				 
+									}
+								}
+								else if (index == newValue) {
+									if (!column.selected) {
+										selected.addCls('meow');
+										column.selected = true;				 
+									}
+								}
+								else {
+									if (column.selected) {
+										selected.removeCls('meow');
+										column.selected = false;				 
+									} 
+								}
+							});
+						}
+					}
+				}
+			}, 
+			{ 
+				xtype:'numberfield',
+				fieldLabel: 'Parameter Size',              
+				name: 'size',
+				minValue: 1,
+				//	  maxValue : maxSize,
+				listeners : 
+				{
+					scope : this,
+					change : function(field, newValue, oldValue){
+						var grid =  this.down('gridpanel');
+						if (!grid) return;
+						var start =  field.prev().value;
+						var columns = grid.columns;
+						Ext.Array.each(columns, function(column,index){
+							var selected = Ext.select(column.getCellSelector(index));
+							if (index <= start) {}
+							else if (index - start < newValue) {
+								if (!column.selected){
+									selected.addCls('meow');
+									column.selected = true;	
+								}
+							}
+							else {
+								if (column.selected){
+									selected.removeCls('meow');
+									column.selected = false;	
+								}
+							}
+						});
+					}
+				}
+			}, 
+			{
+				xtype:'numberfield',
+				fieldLabel: 'Min Sampling',              
+				name: 'minsampling'
+			},
+			{
+				xtype:'numberfield',
+				fieldLabel: 'Max Sampling',              
+				name: 'maxsampling'
+			},
+			{
+				fieldLabel: 'Filling Value',              
+				name: 'fillvalue'
+			},
+			{
+				fieldLabel: 'Units',              
+				name: 'units'
+			},  
+			comboPlotType, 
+			{
+				fieldLabel: 'Y Title',              
+				name: 'ytitle'
+			},
+			{
+				fieldLabel: 'Legend',              
+				name: 'legend'
+			}],
+			listeners: 
+			{
+				click: {
+					element: 'el',
+					fn: function(e,t) {	 		 
+						var me = t,
+						text = me.getAttribute('amda_clicktip');
+						if (text) {
+								e.preventDefault();
+								AmdaAction.getInfo({name : text}, function(res,e) {					    					   
+									if (res.success) myDesktopApp.infoMsg(res.result);
+								}); 
+						}
+					}
+				}			
+			}
+		};
+
+		var myConf = {
+			layout: 'border',		 
+			items: [ 
+				{   
+					xtype : 'form',
+					bodyStyle: { background : '#dfe8f6'},
+					layout: 'hbox',   
+					region: 'center',
+					buttonAlign:'left',
+					items : [
+							panelLeft 
+					],
+					buttons: [
+					{
+						scope : this,  
+						text: 'Show/Hide Table definition',   
+						handler: function() 
+						{
+							this.getPlugin('tabledef').showHide();
+						}
+					},
+					'->',
+					{  
+						scope : this,  
+						text: 'Save',
+						handler: function() 
+						{   
+							var form = this.down('form').getForm();     
+							// check if variable was selected
+							// cdf,...
+							var radio = this.down('radiogroup');            
+							if (radio && radio.getChecked().length == 0) {
+								myDesktopApp.warningMsg('Select variable from the file, please');
+								return;
+							}
+							// ascii
+							if (!radio && this.columns.length > 0) {                                  
+								if (!form.findField('start').getValue() || !form.findField('size').getValue()) {                                    
+								myDesktopApp.warningMsg('Select column[s] from the file, please');
+								return;
+								}                                  
+							}
+							var nameField = form.findField('mydataName'); 
+							if (this.updateObject(nameField))
+							{
+								var myDataModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.my_data.id);	
+								if (!myDataModule)
+										return;
+								var me = this;
+								myDataModule.linkedNode.isValidName(nameField.getValue(), function (res) {
+									if (!res) {
+										nameField.validFlag = 'Error during object validation';
+										myDesktopApp.errorMsg(nameField.validFlag);
+										nameField.validate();
+										return;
+									}
+									
+									if (!res.valid)
+									{
+										if (res.error)
+										{
+											if (res.error.search('subtree') != -1) {
+												Ext.MessageBox.show({title:'Warning', 
+													msg: res.error+'<br/>Do you want to overwrite it?',
+													width: 300,
+													buttons: Ext.MessageBox.OKCANCEL, 
+													fn : me.overwriteProcess,
+													icon: Ext.MessageBox.WARNING,
+													scope : me
+												});
+												nameField.validFlag = true;
+											}
+											else
+												nameField.validFlag = res.error;
+										}
+										else
+										{
+											nameField.validFlag = 'Invalid object name';
+											myDesktopApp.errorMsg(nameField.validFlag);
+										}
+										nameField.validate();
+										return;
+									}
+								
+									nameField.validFlag = true;
+									nameField.validate();
+									me.saveProcess();
+								});
+							}
+						}
+					},
+					{
+						scope : this,
+						text: 'Reset',
+						handler: function(){				      
+							this.down('form').getForm().reset();
+						}
+					}]
+				},
+				{
+					xtype: 'panel', 
+					region: 'south',
+					title: 'Information',
+					collapsible: true,
+					height: 100,
+					autoHide: false,
+					iconCls: 'icon-information',
+					bodyStyle: 'padding:5px',
+					loader: {
+							autoLoad: true,
+							url: helpDir+'myDataHOWTO'
+					}  
+				}],
+			  
+				plugins: [ {ptype: 'tabledef', pluginId: 'tabledef'} ]
+		};
+
+		Ext.apply (this, Ext.apply(arguments, myConf));
+	},
+    
+	getParameterSize : function()
+	{
+		var form = this.down('form').getForm();
+		return form.findField('size').getValue();
+	}
 });
 /**
   * Project      :  AMDA-NG
   * Name         : RemoteSearchPlug.js
-  * @plugin 	  amdaUI.InteractiveIntervalPlug
-  * @extends 	  Ext.AbstractPlugin 
-  * @ptype 	 	  interactiveIntervalPlugin
-  * @brief		 Plot interactive session UI (View)
-  * @author Myriam
-  * @version $Id: RemoteSearchPlugin.js 1130 2012-12-18 16:45:54Z elena $
-  ********************************************************************************
-  *    FT Id     :   Date   : Name - Description
-  *******************************************************************************
-  *  :          
+  * @plugin 	  remoteSearchPlugin
+  * @extends 	  Ext.AbstractPlugin         
   */
@@ -22,93 +14,85 @@ Ext.define(&#39;amdaUI.RemoteSearchPlugin&#39;, {
 	win : null,
- 	constructor: function(config) { 	  
-        Ext.apply(this, config);  
-        this.callParent(arguments);
+	constructor: function(config) { 	  
+		Ext.apply(this, config);  
+		this.callParent(arguments);
 	},
 	init: function(cmp) {
-	    this.hostCmp = cmp;   
-	    this.hostCmp.on({
-		open: this.onOpen, 	
-		scope: this});
+		this.hostCmp = cmp;   
+		this.hostCmp.on({
+			open: this.onOpen, 	
+			scope: this});
 	},
-		 	
+
 	onDestroy : function() {
-	     this.win = null;
+			this.win = null;
 	},
 	onOpen: function(url) {
-	  //TODO just reloa dtree
-	        if (this.win) this.win.destroy();
+		//TODO just reload tree
+		if (this.win) this.win.destroy();
 		if (!this.win) {
-		  this.win = new Ext.Window({			
-			  id: 'remoteSearch-win',  
-			  width: 310, 
-			  height: 500,			 	 
-			  title: url,
-			  layout: 'fit',
-			  constrain: true,
-			  ghost: false,			 
-			  items: this.getTree(url),
-			  listeners: {
-			      scope: this,			    
-			      beforeclose: function(){			      				 
-	//			  Ext.PluginManager.unregister(this);
-			      }
-			  },
-			  getConstrainVector: function(constrainTo){
+			this.win = new Ext.Window({			
+				id: 'remoteSearch-win',  
+				width: 310, 
+				height: 500,			 	 
+				title: url,
+				layout: 'fit',
+				constrain: true,
+				ghost: false,			 
+				items: this.getTree(url),
+				getConstrainVector: function(constrainTo){
 					var me = this;
-			        if (me.constrain || me.constrainHeader) {
-			            constrainTo = constrainTo || (me.floatParent && me.floatParent.getTargetEl()) || me.container || me.el.getScopeParent();
-			            return (me.constrainHeader ? me.header.el : me.el).getConstrainVector(constrainTo);
-			        }
-			    }
-		  });
-		  this.win.on('destroy', this.onDestroy, this);
-		
-		//  Ext.PluginManager.register(this);		 
-	
-		  this.win.show();		 		 		 		 
-	  }
+						if (me.constrain || me.constrainHeader) {
+							constrainTo = constrainTo || (me.floatParent && me.floatParent.getTargetEl()) || me.container || me.el.getScopeParent();
+							return (me.constrainHeader ? me.header.el : me.el).getConstrainVector(constrainTo);
+						}
+					}
+			});
+			this.win.on('destroy', this.onDestroy, this);	 
+
+			this.win.show();
+		}
 	},
-	getTree : function(url) {
-	  
-	  var store = Ext.create('Ext.data.TreeStore', {
-	  model: 'amdaModel.AmdaNode',		     
-	  root: {			  			  
-	      text: url,	   
-	      nodeType : 'url',
-	      expanded: true
-	  } ,
-	  listeners: {
-	    scope : this,
-	    beforeload: function(store, operation){
-	      store.proxy.extraParams = {
-		   nodeType: 'url',
-		   baseId: url
-	      }}	     
-	    }
+	getTree : function(url) 
+	{
+		var store = Ext.create('Ext.data.TreeStore', {
+			model: 'amdaModel.AmdaNode',		     
+			root: {
+				text: url,	   
+				nodeType : 'url',
+				expanded: true
+			} ,
+			listeners: {
+				scope : this,
+				beforeload: function(store, operation){
+					store.proxy.extraParams = {
+						nodeType: 'url',
+						baseId: url
+					}
+				}	     
+			}
+		});
-	  });
-	  
-	  var tree = Ext.create('Ext.tree.Panel', {
-	    store: store,
-	    listeners : {
-	        scope : this,
-		itemdblclick: function(view, record, item, index, event){
-                    event.stopEvent();
-		    var form = this.hostCmp.down('form').next().getForm();
-		    form.getFields().getAt(1).setValue(record.internalId);	// internalId ??			
-		    this.win.destroy();
-		}
-	      }
-	    });
+		var tree = Ext.create('Ext.tree.Panel', {
+			store: store,
+			listeners : {
+				scope : this,
+				itemdblclick: function(view, record, item, index, event){
+					event.stopEvent();
+					var form = this.hostCmp.down('form').next().getForm();
+					form.getFields().getAt(1).setValue(record.internalId);	// internalId ??			
+					this.win.destroy();
+				}
+			}
+		});
-	  return tree;	     	  	  
+		return tree;	     	  	  
 	}
 });
 \ No newline at end of file
@@ -15,15 +15,16 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 	requires : [
 		'amdaUI.RemoteSearchPlugin'
 	],
-        
-	isFile : true,
-	isTimeTable : false,
-	tmpNode : null,
+	tmpNode : null,
+	specialItems : null,
+	formats : null,
+	localName : null,
+	
 	constructor: function(config) 
 	{  
 		this.init(config);
-		this.callParent(arguments);  		        
+		this.callParent(arguments);
 	},
 	/*
@@ -39,8 +40,7 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 			var me = this;
 			myDesktopApp.getLoadedModule(this.tmpNode.get('moduleId'), true, function (module){
 				// myData
-				if (me.tmpNode.get('nodeType') == amdaModel.MyDataParamNode.nodeType) 
-				{		       
+				if (me.tmpNode.get('nodeType') == amdaModel.MyDataParamNode.nodeType) {		       
 					var linkedFile = Ext.create('amdaModel.MyDataNode', {leaf : true, text : me.tmpNode.get('text')});
 					linkedFile.create(result.mask, result.description, result.maskDesc);
@@ -53,37 +53,33 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 					linkedFile.set('object',paramObj);
 					me.tmpNode.set('fileObject',paramObj);
 				}
-				else 
-				{
+				else {
 					// Time Table or Catalog
 					var paramObj = Ext.create(me.tmpNode.get('objectDataModel'), result);
 					paramObj.set('fromPlugin',true);
-					if (result.intervals) 
-					{
+					if (result.intervals) {
 						paramObj.set('intervals',result.intervals);
 						paramObj.set('nbIntervals',result.intervals.length);
 					}
 					me.tmpNode.set('object',paramObj);
 				}	
-				if (module)
-				{
+				if (module) {
 					module.setLinkedNode(me.tmpNode); 	      
 					module.linkedNode.editInModule();  
 				}
 			}); 
 		} 
-		else 
-		{	   
+		else {   
 			// EXCEPTION : parameter not found !
 			myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"+this.tmpNode.get('text')+"' found!");	     
 		}
+		
 		loadMask.hide();
 	},
 /*
 *  form validation
-*  TODO markInvalid()?
 */
 	validate : function() 
 	{
@@ -91,59 +87,43 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 		if (values['filesrc'] == 'LOCAL') 
 		{
-			if (this.isFile) var locFile = this.getForm().findField('localFileName').getValue();
-			else if (this.isTimeTable) var locFile = this.getForm().findField('localTTName').getValue();
-			else var locFile = this.getForm().findField('localCatName').getValue();
-													 	
-			if (!locFile) 
-			{
+			var locFile = this.getForm().findField(this.localName).getValue();
+
+			if (!locFile) {
 				myDesktopApp.warningMsg("Select File to Upload");
 				return false;
 			}
 		}
 		else 
 		{
-			if (!values['remoteFile'] && !values['remoteTT'] && !values['remoteCat']) 
-			{
+			if (!values['remoteFile'] && !values['remoteTT'] && !values['remoteCat']) {
 				myDesktopApp.warningMsg("Select File to Upload");
 				return false;
 			}
-		}	     	     
+		}
+		
 		return true;
 	},
-	//TODO proper parsing
+/*
+ *  Upadte format if user didn't do this himself
+ */
 	updateFormat: function(value) 
 	{    
 		var arrayOfStr = value.split('.');
-		//TODO use down method?	  
-		if (this.isFile) 
-		{
-			var radios = Ext.getCmp('filefrmt');
-			var user_format_obj = radios.getValue();	  
-			var user_format = user_format_obj.filefrmt;
-		}
-		else if (this.isTimeTable)
-		{
-			var radios = Ext.getCmp('ttfrmt');
-			var user_format_obj = radios.getValue();	  
-			var user_format = user_format_obj.ttfrmt;
-		}
-		else
-		{
-			var radios = Ext.getCmp('catfrmt');
-			var user_format_obj = radios.getValue();	  
-			var user_format = user_format_obj.catfrmt;
-		}
-					
-		var auto_format = user_format;
+
+		var radios = Ext.getCmp(this.radioId);
+		var user_format_obj = radios.getValue();
+
+		var user_format = user_format_obj[this.radioId];
 		//  auto define format in some special cases 
 		//TODO name without extention => ASCII?
-		if (arrayOfStr.length == 1) auto_format = 'ASCII'; 
-		else  
-		{
+		if (arrayOfStr.length == 1) {
+			auto_format = 'ASCII'; 
+		}
+		else  {
 			var suffix = arrayOfStr[arrayOfStr.length - 1].toLowerCase();
 			if (suffix == 'gz') 
 				suffix = arrayOfStr[arrayOfStr.length - 2].toLowerCase() + '.gz';
@@ -155,35 +135,30 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				case 'cef' :  auto_format = 'CEF'; break;
 				case 'xml' :  auto_format = 'VOT';
 				case 'vot' :  auto_format = 'VOT'; break;
-				case 'nc'  :  auto_format = 'NC'; break;
+				case 'nc'  :  auto_format = 'NC';  break;
 				case 'asc' :
 				case 'txt' :			 
 				default : auto_format = 'ASCII'; 			   
 			}
 		} 
 		// set auto format : case when format was not set by user before   
-		if (this.isFile && user_format !== auto_format) {
-				user_format_obj.filefrmt = auto_format;    
-		} else  if (this.isTimeTable && user_format !== auto_format) {
-				user_format_obj.ttfrmt = auto_format;
-		} else if (!this.isFile && !this.isTimeTable && user_format !== auto_format) {
-			user_format_obj.catfrmt = auto_format;
-		}
-		
+		if (user_format !== auto_format) {
+			user_format_obj[this.radioId] = auto_format;    
+		} 
+
 		radios.setValue(user_format_obj);
 	},
-	/*
-	* 
-	*/
+/*
+* 
+*/
 	forceUpload : function (url,format,onFinish)
 	{
 		var me = this;
 		var re = /http:\/\/127.0.0.1:/;
 		var isRemoteUrl = !re.test(url);
-		switch (format)
-		{
+		switch (format) {
 			case 'votable' :
 				this.getForm().findField('filefrmt').setValue('VOT');
 				break;
@@ -230,14 +205,14 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 		this.postUpload(onFinish);
 	},
-	/*
-	* 
-	*/
+/*
+* 
+*/
 	postUpload : function(onFinish)
 	{
 		// 'global' form containing 'partial' forms				      
 		var form = this.getForm();
-		
+
 		// special validation 	            
 		if(this.validate())
 		{
@@ -246,16 +221,14 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				scope: this,
 				url: 'php/uploadFile.php',
 				waitMsg: 'Uploading your file...',
-				success: function(form, o)
-				{
+				success: function(form, o) {
 					if (onFinish)
 						onFinish();
 					this.tmpNode = Ext.create(this.nodeType,{leaf : true, text : o.result.file});
 					AmdaAction.getUploadedObject(o.result.file, o.result.format, this.tmpNode.get('nodeType'), this.getObjectCallback, this);
 					loadMask.hide();
 				},
-				failure: function(form, o) 
-				{
+				failure: function(form, o) {
 					if (onFinish)
 						onFinish();
 					loadMask.hide();
@@ -265,25 +238,19 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 		}		
 	},
-	/*
-	*  panel config
-	*/
-	init : function(config) 
-	{       
-		this.isFile = config.panelType == 'file'? true : false;
-		this.isTimeTable = config.panelType == 'timetable'? true : false;
-		
-		// file / time table / catalog settings	  
-		if (this.isFile) 
-		{	    
-			var title = 'File';
-			var items = [
+	initFileUpload : function()
+	{
+		this.formats = [
 				{ boxLabel: 'ASCII', name: 'filefrmt', inputValue: 'ASCII', checked: true,
-					listeners: 
-					{
+					listeners: {
 						change: function (cb, nv, ov) {
-							if (nv) Ext.getCmp('tf').show();
-							else Ext.getCmp('tf').hide();	
+							if (nv) { 
+								Ext.getCmp('tf').show();
+							}
+							else {
+								Ext.getCmp('tf').hide();
+								Ext.getCmp('nfs').hide();
+							}
 						}
 					} 
 				}, 
@@ -291,143 +258,95 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				{ boxLabel: 'CDF&nbsp;<img amda_clicktip="cdfTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'filefrmt', inputValue: 'CDF' },
 			// { boxLabel: 'CEF[GZ]', name: 'filefrmt', inputValue: 'CEF' },
 				{ boxLabel: 'VOTable', name: 'filefrmt', inputValue: 'VOT' }];
-			var timeFormatId = 'tf';
-			this.formatId = 'nsf';
+
 			this.localUploadId = 'form-uploadfile';
-			var localUploadName ='localFileName';
-			var remoteUploadName ='remoteFile';
 			this.remoteUploadId = 'form-uploadurl'; 	 
-			this.nodeType = 'amdaModel.MyDataParamNode';
-			//TODO load XML	   
-			var store = Ext.create('Ext.data.Store', {
+			this.nodeType = 'amdaModel.MyDataParamNode';	   
+			this.store = Ext.create('Ext.data.Store', {
 				fields: ['value', 'name'],
-				data : [
-					{"value":"ftp://cdaweb.gsfc.nasa.gov/pub/data/", "name":"CDAWEB/FTP"}/*,		   
-					{"value":"ftp://ftp.ngdc.noaa.gov/STP/SOLAR_DATA/", "name":"Solar Data"}*/]
-			});	   
-		}
-		else if (this.isTimeTable)
-		{		
-			var title = 'Time Table';
-			var items = [
-				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'ttfrmt',  inputValue: 'ASCII', checked: true},
-				{ boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}
-			];
-			var timeFormatId = 'tf_tt'; 
-			this.formatId = 'nsf_tt';
-			this.localUploadId = 'form-uploadtt';
-			var localUploadName ='localTTName';
-			var remoteUploadName ='remoteTT';
-			this.remoteUploadId = 'form-uploadtturl'; 
-			this.nodeType = 'amdaModel.TimeTableNode';
-			//TODO load XML		    
-			var store = Ext.create('Ext.data.Store', {
-					fields: ['value', 'name'],
-					data : []
+				proxy: {
+					type: 'ajax',
+					url : 'generic_data/remote_sites.json',
+					reader: {
+						type: 'json',
+						root: 'remote_sites'
+					}
+				},
+				autoLoad: true
 			});
-		}
-		else 
-		{
-			var title = 'Catalog';
-			var items = [
-				{ boxLabel: 'VOTable', name: 'catfrmt', inputValue: 'VOT', checked: true }];
-						
-			var timeFormatId = 'tf_cat'; 
-			this.formatId = 'nsf_cat';
-			this.localUploadId = 'form-uploadcat';
-			var localUploadName ='localCatName';
-			var remoteUploadName ='remoteCat';
-			this.remoteUploadId = 'form-uploadcaturl'; 
-			this.nodeType = 'amdaModel.CatalogNode';
-			//TODO load XML		    
-			var store = Ext.create('Ext.data.Store', {
-					fields: ['value', 'name'],
-					data : []
-			});
-		}
-		
-		var combo = Ext.create('Ext.form.ComboBox', {
-				flex : 4, 
-				store: store,
-				emptyText: 'Enter Remote Site URL (ftp)',
-				queryMode: 'local',
-				displayField: 'name',
-				valueField: 'value' 
-		});
-	    	  
-		var fieldcontainer = 
-		{ 
-			xtype: 'fieldcontainer', 
-			fieldLabel: ' ', labelWidth: 0, labelSeparator : '', labelPad : 0,
-			layout: 'hbox',		
+			this.radioId = 'filefrmt';
+
+/*
+ *  Sampling : TimeFormat Fieldset  
+ */    
+		this.autoSampling = Ext.create('Ext.form.RadioGroup', {
+		//	fieldLabel : 'Constant or Variable ?',
+		//	labelWidth: 90,
+			defaults : {name : 'timesmpl'},
 			items: [
-				combo,
-				{
-					xtype : 'button',
-					flex : 1,
-					text: 'Browse It',								   
-						handler: function()
-						{					      
-							var form = this.up('form').getForm(); 
-							var site = form.getFields().getAt(0).getValue(); 					    
-							if (site) 						   
-								this.up('form').ownerCt.fireEvent('open', site);
-							else 
-								myDesktopApp.warningMsg("Please Enter Remote Site URL");				 
-						} 
-				}]
-		};
-		
-		if (this.isFile) var radioId = 'filefrmt';
-		else if (this.isTimeTable) var radioId =	'ttfrmt';
-		else var radioId = 'catfrmt';
+				{boxLabel: 'constant sampling', inputValue: 'constant', checked: true},
+				{boxLabel: 'variable sampling&nbsp;<img amda_clicktip="variableSampling" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'variable'}	  
+			]
+		});
-		var fileFormat =  Ext.create('Ext.form.FieldSet', { 			      
-			title: 'File Format',			     		     
-			items : [{ 
-				xtype: 'radiogroup',
-				id : radioId, 
-				columns: 3,
-				cls: 'x-check-group-alt',
-				items: items				
+		this.manualSampling = Ext.create('Ext.form.FieldContainer', { 
+			defaultType: 'numberfield',
+			layout: 'anchor',
+			defaults: {
+				layout: '100%',
+				labelWidth : 150,
+				minValue : 0.001,
+				hideTrigger: true
+			}, 
+			hidden : true,
+			items: [  
+			{ 
+				fieldLabel : 'min sampling',	
+				name : 'min_manual_sampling'
+			},  
+			{ 
+				fieldLabel : 'max sampling',	
+				name : 'max_manual_sampling'				   
 			}]
+		}); 
+	
+		var Sampling = Ext.create('Ext.form.RadioGroup', {
+			fieldLabel: 'Time Sampling',
+			labelWidth: 90,   
+			cls: 'x-check-group-alt',	
+			defaults : {name : 'smpl'},
+			items: [
+				{boxLabel: 'auto-defined', inputValue: 'auto', checked: true},
+				{boxLabel: 'manual', inputValue: 'manual'}
+			],
+			listeners: {
+				scope : this,
+				change: function (cb, nv, ov) {
+					if (nv.smpl == 'manual') {
+							this.autoSampling.setVisible(false);
+							this.manualSampling.setVisible(true);
+					}
+					else {   
+							this.autoSampling.setVisible(true);
+							this.manualSampling.setVisible(false);
+					}
+				}
+			}
 		});
-            
-		var Sampling = 
-		{ 
-			xtype: 'radiogroup',	
-			fieldLabel: 'Time Sampling',	
-			labelWidth: 90,			  
-			cls: 'x-check-group-alt',
-			hidden : !this.isFile,
-			defaults : {name : 'timesmpl'},
-			items: [ 			
-				{boxLabel: 'constant', inputValue: 'constant', checked: true},
-				{boxLabel: 'variable&nbsp;<img amda_clicktip="variableSampling" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'variable'}	  
-			] 		
-		};
-	  
-		var dayStart = 
-		{ 
-			xtype: 'checkbox',  
-			name : 'doy',
-			hidden : true,
-			fieldLabel: 'DOY starts from 1',
-			inputValue: '1'
-		};
-			
-		var nonStandardFormat = 
-		{ 
+		
+/*
+ *  NonStandardFormat : TimeFormat Fieldset  
+ */
+		var nonStandardFormat = { 
 			xtype: 'fieldcontainer',
 			defaultType: 'textfield',
 			layout: 'anchor',
-			defaults: 
-			{
-					layout: '100%',
-					labelWidth : 150
+			defaults: {
+				layout: '100%',
+				labelWidth : 150 
 			}, 
-			id : this.formatId, 
+			id : 'nfs', 
 			hidden : true,
 			items: [  
 			{ 
@@ -435,8 +354,7 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				name : 'nonstd',				   
 				value: 'Y-m-d H:i:s',
 				enableKeyEvents: true,
-				listeners : 
-				{
+				listeners : {
 					keyUp : function() {
 						if (this.getValue().indexOf('z') > 0) {
 							this.nextSibling().show();
@@ -446,67 +364,165 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 						}                                                 
 					}
 				}
-			},
-			dayStart,
-			{ 
-					fieldLabel : 'define max time length',
-					name : 'timelength',
-					value: 'auto' 				    
+			},{ 
+				xtype: 'checkbox',  
+				name : 'doy',
+				fieldLabel: 'DOY starts from 1',
+				hidden : true,
+				inputValue: '1'
+			},{ 
+				fieldLabel : 'define max time length',
+				name : 'timelength',
+				value: 'auto'    
 			}],
-			listeners : 
-			{                                        
+			listeners : {
 				hide : function() {
 						this.items.getAt(1).hide();                                                
+				},
+				show : function() {
+					if (this.items.getAt(0).getValue().indexOf('z') > 0)
+						this.items.getAt(1).show();                                                
 				}
 			}
-		};	 
-
-		var timeFormat = Ext.create('Ext.form.FieldSet', { 
-			id: timeFormatId, 
-			title: 'Time Settings',	
-			hidden : !this.isFile,
-			items : [
-			{
+		};
+		
+/*
+ *  TimeFormat Fieldset :  Global form
+ */
+		var timeFormat = Ext.create('Ext.form.FieldSet', {
+			title: 'Time Settings',
+			items : [{
+				id: 'tf',
 				xtype: 'radiogroup',
 				fieldLabel: 'Time Format',
-				labelWidth: 90,				   
+				labelWidth: 90,   
 				cls: 'x-check-group-alt',
 				defaults : { name : 'timefrmt'},
-				items: [						 
-				{ boxLabel: 'standard&nbsp;<img amda_clicktip="standardTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'standard', checked: true},     			
-				{ boxLabel: 'no&nbsp;<img amda_clicktip="userTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'user', 
-					listeners: 
-					{
-						scope : this,
-						change: function (cb, nv, ov) {							
-						if (nv) 
-								Ext.getCmp(this.formatId).show();
-						else    
-								Ext.getCmp(this.formatId).hide();	
-						}
-					} 					      
-				}] 				      			  	
-			},
-			nonStandardFormat,
-			Sampling ]
+				items: [ 
+					{ boxLabel: 'standard&nbsp;<img amda_clicktip="standardTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'standard', checked: true},     			
+					{ boxLabel: 'no&nbsp;<img amda_clicktip="userTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', inputValue: 'user', 
+						listeners: {
+							change: function (cb, nv, ov) {
+								if (nv) 
+										Ext.getCmp('nfs').show();
+								else    
+										Ext.getCmp('nfs').hide();	
+							}
+						}      
+					}]
+				},
+				nonStandardFormat,
+				Sampling,
+				this.autoSampling,
+				this.manualSampling
+			]
 		});
+		
+		this.specialItems = [ timeFormat,
+					{
+						xtype: 'hidden',
+						name: 'sampData',
+						value: null
+					},
+					{
+						xtype: 'hidden',
+						name: 'sampFileName',
+						value: null
+					}]
+	},
-		var localFile = Ext.create('Ext.form.Panel', {			      
+	initTTUpload : function(isTT)
+	{
+		if (isTT) {
+			this.formats = [
+				{ boxLabel: 'ASCII&nbsp;<img amda_clicktip="ttTimeFormat" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"', name: 'ttfrmt',  inputValue: 'ASCII', checked: true},
+				{ boxLabel: 'VOTable', name: 'ttfrmt', inputValue: 'VOT'}
+			];
+			this.localUploadId = 'form-uploadtt';
+			this.remoteUploadId = 'form-uploadtturl'; 
+			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*/
+			});
+			
+			this.radioId =	'ttfrmt';
+		}
+		else {
+			this.formats = [
+				{ boxLabel: 'VOTable', name: 'catfrmt', inputValue: 'VOT', checked: true }];
+						
+			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*/
+			}); 
+			
+			this.radioId = 'catfrmt';
+		}
+	},
+/*
+*  panel config
+*/
+	init : function(config) 
+	{       
+		 
+		if ( config.panelType == 'file' )
+				this.initFileUpload();
+		else 
+				this.initTTUpload(config.panelType == 'timetable');
+
+		this.localName = config.localUploadName;
+ /*
+ *  FileFormat Fieldset 
+ */ 
+		var fileFormat =  Ext.create('Ext.form.FieldSet', { 			      
+			title: 'File Format',			     		     
+			items : [{ 
+				xtype: 'radiogroup',
+				id : this.radioId, 
+				columns: 3,
+				cls: 'x-check-group-alt',
+				items: this.formats
+			}]
+		}); 
+
+/*
+ * FileSource Fieldset : Local File Upload
+ */
+		var localFile = Ext.create('Ext.form.Panel', {      
 			id: this.localUploadId,
 			fileUpload: true,
 			hideLabels: true,
 			frame: true,			      
-			items: [
-			{
-				xtype: 'fileuploadfield',							     
+			items: [{
+				xtype: 'fileuploadfield',     
 				emptyText: 'Select Your File',
 				width: 300,
-				name: localUploadName,  
+				name: this.localName,  
 				buttonText: 'Browse',
-				listeners: 
-				{
+				listeners: {
 					scope : this,
-					change: function (field, value, e) {							
+					change: function (field, value, e) {
 							this.updateFormat(value);	
 					} 
 				}
@@ -517,41 +533,75 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 				name: 'MAX_FILE_SIZE',
 				value: myDesktopApp.MAX_UPLOADED_FILE_SIZE // 30MB	 			      
 			}] 
-		});      
-	
-		var remoteFile = Ext.create('Ext.form.Panel', {					 
-			id: this.remoteUploadId,					 
+		});
+		
+/*
+ * FileSource Fieldset : Remote File Upload
+ */
+		var combo = Ext.create('Ext.form.ComboBox', {
+				flex : 4, 
+				store: this.store,
+				emptyText: 'Enter Remote Site URL (ftp/http[s])',
+				queryMode: 'local',
+				displayField: 'name',
+				valueField: 'value' 
+		});
+	    	  
+		var fieldcontainer = { 
+			xtype: 'fieldcontainer', 
+			fieldLabel: ' ', labelWidth: 0, labelSeparator : '', labelPad : 0,
+			layout: 'hbox',		
+			items: [
+				combo,
+				{
+					xtype : 'button',
+					flex : 1,
+					text: 'Browse It',								   
+					handler: function() {					      
+						var form = this.up('form').getForm(); 
+						var site = form.getFields().getAt(0).getValue(); 					    
+						if (site) 						   
+							this.up('form').ownerCt.fireEvent('open', site);
+						else 
+							myDesktopApp.warningMsg("Please Enter Remote Site URL");				 
+					} 
+				}]
+		};
+		
+		var remoteFile = Ext.create('Ext.form.Panel', { 
+			id: this.remoteUploadId, 
 			hideLabels: true,
-			autoHeight: true,					 
+			autoHeight: true, 
 			frame: true,
 			hidden : true,
 			items: [  
 				fieldcontainer,
 				{ 
 					xtype : 'textfield',
-					name : remoteUploadName, 
-					emptyText: 'Enter Remote File URL (http or ftp)',
+					name : config.remoteUploadName, 
+					emptyText: 'Enter Remote File URL (ftp/http[s])',
 					width: 310,
 					listeners: 
 					{
 						scope : this,
-						change: function (field, value, e) {							
-									this.updateFormat(value);	
+						change: function (field, value, e) {
+									this.updateFormat(value);
 						} 
 					}
 				}]
 		});
-                                        
-		var uploadForm = Ext.create('Ext.form.FieldSet',{				    			    
-			title: 'File Source',			     
-			items : [
-			{ 
-				xtype: 'radiogroup',					 
+		
+ /*
+ * FileSource Fieldset  :  global form
+ */                                       
+		var uploadForm = Ext.create('Ext.form.FieldSet',{    
+			title: 'File Source',     
+			items : [{ 
+				xtype: 'radiogroup', 
 				cls: 'x-check-group-alt',
 				items: [
 					{ boxLabel: 'Local', name: 'filesrc', inputValue: 'LOCAL', checked: true,
-						listeners: 
-						{
+						listeners: {
 							scope : this,
 							change: function (cb, nv, ov) {
 								if (nv == ov) return;
@@ -559,67 +609,52 @@ Ext.define(&#39;amdaUI.UploadPanelUI&#39;, {
 								var remote = Ext.getCmp(this.remoteUploadId);
 								if (nv) {
 										remote.hide();
-										local.show();					
+										local.show();
 								}
 								else  {
 										local.hide();
-										remote.show();									    
+										remote.show();    
 								}   
 							}
 						} 
 					},
-					{ boxLabel: 'URL', name: 'filesrc', inputValue: 'URL'} ]				
+					{ boxLabel: 'URL', name: 'filesrc', inputValue: 'URL'}]
 			}]
 		});		      
-														
+
+/*
+ * Panel Config
+ */
 		var myConf = 
 		{
-			title : title,  
+			title : config.title,  
 			layout: {type: 'vbox', align: 'stretch'},
+			autoScroll : true,
 			bodyStyle: { background : '#dfe8f6'},
-			items : [ 
-					uploadForm,
-					localFile, 
-					remoteFile, 			     
-					fileFormat,
-					timeFormat,
-					{
-						xtype: 'hidden',
-						name: 'sampData',
-						value: null
-					},
-					{
-						xtype: 'hidden',
-						name: 'sampFileName',
-						value: null,
-					}
-			],
-			buttons: [
-			{
+			items : Ext.Array.merge(
+					[ uploadForm, localFile, remoteFile, fileFormat ],
+					this.specialItems ), 
+			buttons: [{
 				text: 'Upload',
-				handler: function()
-				{
+				handler: function() {
 					this.postUpload();
 				},
 				scope : this
 			},
 			{
 				text: 'Reset',
-				handler: function(){				      
+				handler: function() {      
 					this.up('form').getForm().reset();  
 				}
 			}], 
 			plugins: [{ptype: 'remoteSearchPlugin'}],
-			listeners:
-			{
-				click: 
-				{
+			listeners:{
+				click: {
 					element: 'el',
-					fn: function(e,t) {	 		 
+					fn: function(e,t) { 
 						var me = t,
 						text = me.getAttribute('amda_clicktip');
-						if (text) 
-						{
+						if (text) {
 							e.preventDefault();
 							AmdaAction.getInfo({name : text}, function(res,e) {					    					   
 								if (res.success) myDesktopApp.infoMsg(res.result);
@@ -33,9 +33,9 @@ Ext.define(&#39;amdaUI.UploadUI&#39;, {
 				region: 'center',  
 				activeTab : 0,   
 				items : [ 
-				{ xtype: 'panelUpload', panelType : 'file'},
-				{ xtype: 'panelUpload',  panelType : 'timetable'},
-				{ xtype: 'panelUpload',  panelType : 'catalog'}]
+				{ xtype: 'panelUpload',  panelType : 'file', title : 'File', localUploadName : 'localFileName', remoteUploadName : 'remoteFile'},
+				{ xtype: 'panelUpload',  panelType : 'timetable', title : 'Time Table', localUploadName : 'localTTName', remoteUploadName : 'remoteTT'},
+				{ xtype: 'panelUpload',  panelType : 'catalog', title : 'Catalog', localUploadName : 'localCatName', remoteUploadName :'remoteCat'}]
 			},
 			{
 				xtype: 'panel', 
@@ -113,19 +113,28 @@ class FilesMgr extends AmdaObjectMgr
 		else {
 			$size = 1;		  
 		} 
-
-		return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs);
+		
+		$units =  exec('cdfvar_attr '.$this->fileName.' '.$cdfVarId.' UNITS');
+		$fillval =  exec('cdfvar_attr '.$this->fileName.' '.$cdfVarId.' FILLVAL');
+		
+		return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs, 'units' => $units, 'fillvalue' => $fillval);
 	}
-	public function getCdfSampling() 
-	{
+	public function getCdfSampling() {
 		copy($this->fileName, "temp.cdf");         
 		exec('cdfsamplingfromdata ', $results);
 		unlink("temp.cdf");
 		return $results;
 	}
+	
+	public function getCdfSamplings() {
+		copy($this->fileName, "temp.cdf");         
+		exec('cdfsamplingsfromdata ', $results);
+		unlink("temp.cdf");
+		return $results;
+	}
 /*
 *       CEF format processing
 */
@@ -214,7 +223,7 @@ class FilesMgr extends AmdaObjectMgr
 	{
 		exec('ncvarinfo '.$this->fileName.' '.$this->param2dd($varId), $results);
 		$tempArr = explode(' ', $results[0]); 
-	// data type
+		// data type
 		switch ($tempArr[0]) {
 			case "5": $data_type = 'FLOAT';
 						break;
@@ -238,7 +247,15 @@ class FilesMgr extends AmdaObjectMgr
 				$size = 1;		  
 		}  
-		return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs);
+		$units =  exec('ncvar_attr '.$this->fileName.' '.$this->param2dd($varId).' UNITS');  
+		if (substr($units, 0,5) == 'error') $units = '';
+		
+		$fillval =  exec('ncvar_attr '.$this->fileName.' '.$this->param2dd($varId).' _Fillvalue'); // _Fillvalue
+		if (substr($fillval, 0,5) == 'error') $fillval =  exec('ncvar_attr '.$this->fileName.' '.$this->param2dd($varId).' Fillvalue');
+		if (substr($fillval, 0,5) == 'error') $fillval =  exec('ncvar_attr '.$this->fileName.' '.$this->param2dd($varId).' Fillval');
+		if (substr($fillval, 0,5) == 'error') $fillval = '';
+		
+		return array('type' => $data_type, 'size' => $size, 'n_records' => $n_recs, 'units' => $units, 'fillvalue' => $fillval);
 	}
 	protected function param2dd($paramID)
@@ -583,22 +600,30 @@ class FilesMgr extends AmdaObjectMgr
 	}
-	protected function createFile($format) 
+	protected function createFile($format, $samplingType) 
 	{              
 		$newFile = $this->contentDom->createElement('file');
 		$newFile->setAttribute('xml:id', $this->fileId);
 		$newFile->setAttribute('name', $this->fileId);
 		$newFile->setAttribute('format', $format);
-
+		
+		$minSamp = $this->sampling;
+		$maxSamp = $this->maxSampling;
+		
 		switch ($format)
 		{
 			case "cdf":  
 					$start_stop = explode(" ",$this->getCdfStartStop());
-					$result = $this->getCdfSampling();
-					//TODO process errors
-					$minSamp = $result[count($result)-1];
-					//TODO if min & max
-					$maxSamp =  $minSamp;
+					if ($minSamp < 0) {
+						if ($samplingType == 'constant') {
+							$result = $this->getCdfSampling();
+							//TODO process errors
+							$minSamp = $result[count($result)-1];
+							$maxSamp =  $minSamp;
+						} else {
+							// $result = $this->getCdfSamplings();
+						}
+					}
 				break;            
 			case "txt":   
 					$start_stop =  explode(" ",$this->reformatTxt());
@@ -610,16 +635,14 @@ class FilesMgr extends AmdaObjectMgr
 					// Test if 'standard' meta exist in CEF
 					$cefMetaTest = $this->getCefStartStop(); 
-					if ($cefMetaTest != -1) 
-					{
+					if ($cefMetaTest != -1) {
 						$cefStartStop = explode("/",$cefMetaTest); 
 						$start_stop[] = strtotime($cefStartStop[0]);
 						$start_stop[] = strtotime($cefStartStop[1]); 			   
 						$result = $this->getCefSampling();
 						$minSamp = $result[count($result)-1];
 					}
-					else 
-					{
+					else {
 						// no META data - so time processing
 						$timeInfo = $this->getCefTimeInfo();
 						$timeInfoArr = explode(" ", $timeInfo);
@@ -633,8 +656,10 @@ class FilesMgr extends AmdaObjectMgr
 			case "vot" :
 					$start_stop = explode(" ",$this->getVotFileMgr()->getStartStop());
 					$samplings = $this->getVotFileMgr()->getSamplings();
-					$minSamp = $samplings["minSampling"];
-					$maxSamp = $samplings["maxSampling"];
+					if ($minSamp < 0) { 
+						$minSamp = $samplings["minSampling"];
+						$maxSamp = $samplings["maxSampling"];
+					}
 					$desc = $this->getVotFileMgr()->getDescription();
 				break;  
 			case "nc":  
@@ -644,11 +669,13 @@ class FilesMgr extends AmdaObjectMgr
 							return $ncInfo;
 					}
 					$ncInfoArr = explode("#",$ncInfo);
-					$start_stop = explode(":",$ncInfoArr[0]);			   
-					//TODO process errors
-					$minSamp = $ncInfoArr[1];
-					//TODO if min & max
-					$maxSamp =  $minSamp;
+					$start_stop = explode(":",$ncInfoArr[0]);
+					if ($minSamp < 0) {
+						//TODO process errors
+						$minSamp = $ncInfoArr[1];
+						//TODO if min & max
+						$maxSamp =  $minSamp;
+					}
 				break;   
 			default: 
 		}
@@ -1117,20 +1144,27 @@ class FilesMgr extends AmdaObjectMgr
 		$format = $this->getFormat();
-		if ($format === 'unknown')
-		{ 	           
+		if ($format === 'unknown') { 	           
 			unlink($this->fileName);                   
 			return array('success' => false, 'error' => 'Sorry, unknown format of '.$fileName);	
 		}
+		// if sampling is defined by user
+		if ($formats["samplingType"] == "manual") {
+			$this->sampling = $formats["min_sampling"];
+			if ($formats["max_sampling"])
+				$this->maxSampling = $formats["max_sampling"];
+			else
+				$this->maxSampling = $this->sampling;
+		}
+		
+		
 		if ($format == 'txt') 
 		{  
-			if ($formats["timeFormat"] == "user") 
-			{
+			if ($formats["timeFormat"] == "user") {
 				$res =  $this->reformatTime($formats["nonStandard"], $formats["timeLength"], $formats["doy"]);
-				if (!$res) 
-				{
+				if (!$res) {
 					unlink($this->fileName); 
 					return array('success' => false, 'error' => 'can\'t reformat time'); 
 				}
@@ -1138,60 +1172,54 @@ class FilesMgr extends AmdaObjectMgr
 			// check if file is not empty
 			$vars = $this->getTxtColNumber(false);
-			if ($vars == -100) 
-			{
+			if ($vars == -100) {
 					return array('success' => false, 'error' => 'no such file');
 			}
-			if ($vars == -1)
-			{ 
+			if ($vars == -1) { 
 					unlink($this->fileName); 
 					return array('success' => false, 'error' => 'while reading file');
 			}
-			if ($vars === 0) 
-			{
+			if ($vars === 0) {
 					unlink($this->fileName);
 					return array('success' => false, 'error' => 'file contains no data');
 			}
+			
+			// sampling is to be defined automatically
+			if ($this->sampling < 0) {
+				if ($formats["timeSampling"] == "constant") {          
+					$this->sampling = $this->getTxtSampling();	 
+					$this->maxSampling = $this->sampling;
+				}
+				else {
+					$samplings = $this->getTxtSamplings();
+					$this->sampling = $samplings[0];
+					$this->maxSampling = $samplings[1];
+				}
-			if ($formats["timeSampling"] == "constant") 
-			{          
-				$this->sampling = $this->getTxtSampling();	 
-				$this->maxSampling = $this->sampling;
-			}
-			else 
-			{
-				$samplings = $this->getTxtSamplings();
-				$this->sampling = $samplings[0];
-				$this->maxSampling = $samplings[1];
+				if ($this->sampling <= 0) {  
+						unlink($this->fileName); 
+						if ($this->sampling == -10) {
+								return array('success' => false, 'error' => 'Sorry, can\'t process'.$fileName.PHP_EOL.'. Check if there are non numeric chars in the data');
+						}
+						return array('success' => false, 'error' => 'Sorry, can\'t process Time for '.$fileName.PHP_EOL.'. Check time format, start time (> 1970-01-01) or sampling time (>= 1s)');		           
+				}
 			}
-
-			if ($this->sampling <= 0) 
-			{  
-					unlink($this->fileName); 
-					if ($this->sampling == -10) 
-					{
-							return array('success' => false, 'error' => 'Sorry, can\'t process'.$fileName.PHP_EOL.'. Check if there are non numeric chars in the data');
-					}
-					return array('success' => false, 'error' => 'Sorry, can\'t process Time for '.$fileName.PHP_EOL.'. Check time format, start time (> 1970-01-01) or sampling time (>= 1s)');		           
-			}              
 		}
 		if ($format == 'nc')
 		{  
 			$status = $this->reformatNcTime();
-			if ($status <= 0) 
-			{
+			if ($status <= 0) {
 				unlink($this->fileName);
 				return array('success' => false, 'error' => 'error '.$timeFormat.PHP_EOL.'Time Format problem');	
 			}
 		}
 		//create new file tag with all attributes and add it to the content DOM   
-		$newFile = $this->createFile($format);
-		if (is_int($newFile) && ($newFile < 0)) 
-		{ 
+		$newFile = $this->createFile($format, $formats["timeSampling"]);
+		if (is_int($newFile) && ($newFile < 0)) { 
 			unlink($this->fileName);
 			return array( 'success' => false, 'file' => $fileName);
 		}
@@ -1207,8 +1235,8 @@ class FilesMgr extends AmdaObjectMgr
 				$mask->appendChild($newFile);
 				$files = $mask->getElementsByTagName("file");
-				foreach ($files as $file) 
-				{
+				
+				foreach ($files as $file) {
 					$starts[] = $file->getAttribute("start");
 					$stops[] =  $file->getAttribute("stop");
 				}
@@ -1219,8 +1247,7 @@ class FilesMgr extends AmdaObjectMgr
 			}	
 		}                     
 		// no corresponding masks => add to fileList      
-		if (!$isMask)
-		{					  
+		if (!$isMask) {					  
 			$filesList = $this->contentDom->getElementById($this->contentRootId); 
 			$filesList->appendChild($newFile);
 		}        
@@ -1230,8 +1257,7 @@ class FilesMgr extends AmdaObjectMgr
 		//if mask exists - add to data base
 		$myBaseManager = new BaseManager();
 		$mask = $myBaseManager->addFile($fileName); 
-		if ($mask != null) 
-		{
+		if ($mask != null) {
 			$startstop = $myBaseManager->getStartStop($myBaseManager->getVi($mask));
 			$myParamMgr = new DerivedParamMgr('myDataParam');
 			$myParamMgr->updateMydata($mask,$startstop);      
@@ -4,8 +4,8 @@ CFLAGS = -ggdb -DLINUX -m64 -march=core2 -fPIC -Dlinux -D_REENTRANT -malign-doub
 CC = gcc
 EXE = nctimestring2double nctimeinfo getncvars ncvarinfo \
-      ncinfo_remote \
-      cdfinfo cdfvarinfo cdfstartstopfromdata cdfsamplingfromdata \
+      ncinfo_remote ncvar_attr \
+      cdfinfo cdfvarinfo cdfstartstopfromdata cdfsamplingfromdata cdfvar_attr \
       AddVI
 lib: ${EXE}
@@ -14,8 +14,11 @@ AddVI: AddVI.c
 	${CC} ${CFLAGS} -o AddVI AddVI.c ${INC} ${LIB} -lDDClientLibC
 ncinfo_remote: ncinfo_remote.c
-	${CC} ${CFLAGS} -o ncinfo_remote ncinfo_remote.c  ${INC} ${LIB} -lnetcdf	
-	
+	${CC} ${CFLAGS} -o ncinfo_remote ncinfo_remote.c  ${INC} ${LIB} -lnetcdf
+
+ncvar_attr: ncvar_attr.c
+	${CC} ${CFLAGS} -o ncvar_attr ncvar_attr.c  ${INC} ${LIB} -lnetcdf
+
 nctimestring2double: nctimestring2double.c
 	${CC} ${CFLAGS} -o nctimestring2double nctimestring2double.c ${INC} ${LIB} -lDDClientLibC -lnetcdf
@@ -48,7 +51,10 @@ cdfinfo: cdfinfo.c
 cdfvarinfo: cdfvarinfo.c
 	${CC} ${CFLAGS} -o cdfvarinfo cdfvarinfo.c ${INC} ${LIB} -lcdf
-
+	
+cdfvar_attr: cdfvar_attr.c
+	${CC} ${CFLAGS} -o cdfvar_attr cdfvar_attr.c ${INC} ${LIB} -lcdf
+	
 cdfstartstopfromdata: cdfstartstopfromdata.c
 	${CC} ${CFLAGS} -o cdfstartstopfromdata cdfstartstopfromdata.c ${INC} ${LIB} -lcdf
-/* $Id: timeResFromData.c,v 1.1 2010/08/31 10:32:55 budnik Exp $ */
+/* $Id: cdf constant samplig from data $ */
-/** @file timeResFromData.c
-*   @brief Function to get CDAWEB dataset sampling times from data files
-*/
 #include <stdio.h>
 #include <stdlib.h>
 #include <cdf.h>
@@ -46,48 +43,18 @@ void cdf_handle_error(CDFstatus status)
 	exit(1);
 }
-void find_min(int* delta, int nRecs, int minFalse, int* minVal)
-{
-	int i, n, min;
-
-	n = 1;
-	i = 0;
-	while (abs(delta[i]) <= minFalse) i++;
-	if (i < nRecs) {
-		min = abs(delta[i]); 
-		// printf(" first MIN %d \n", min);
-		for (i = 1; i < nRecs; i++) {
-			//   printf(" delta %d \n", delta[i]);
-			if (delta[i] == min) n++;
-			if (delta[i] < min && delta[i] > minFalse) {
-					min = delta[i];
-					n = 1;
-			}
-		}
-	} else {
-		min = -10;
-		n = nRecs;
-	}
-	
-	minVal[0] = min;
-	minVal[1] = n; 
-	printf(" MIN %d %d\n", min, n);
-}
-
 int main(int argc, char *argv[])
 {
-	long RecStart = 0, RecCount, RecInt = 1;
+	long RecStart = 0, RecCount = 2, RecInt = 1;
 	long indices[1] = {0}, intervals[1] = {1}, counts[1] = {1};
 	long varN = -1;  
 	long datatype = 0, attrN, maxEntry;
 	CDFstatus   cstatus;           // CDF status code
 	CDFid id;
 	double *value;
-	int *delta;
 	int i, minFalse = 0, numEnough;
-	int min[2] = {0, 0};
 	char attrValue[300];
-	float Sampling;
+	int sampling;
 	double epoch16[2], dbl_value, dbl_value_;
 	long year, month, day, hour, minute, sec, msec, mksec, nsec, psec; 
 	long long *int_value;
@@ -106,26 +73,27 @@ int main(int argc, char *argv[])
 		if ((cstatus = CDFlib(SELECT_, zVAR_, varN,
 									GET_, zVAR_DATATYPE_, &datatype, NULL_)) != CDF_OK)
 																	cdf_handle_error (cstatus);  
-		//     if (datatype == CDF_EPOCH16)  break;
 	}
+	
 	fprintf(stdout,"DATATYPE %d %d\n", varN, datatype);
 	if ((cstatus = CDFlib(SELECT_, zVAR_, varN,
 								GET_, zVAR_MAXREC_, &CDFmaxRec, NULL_)) != CDF_OK)
 										cdf_handle_error (cstatus);
 	fprintf(stdout,"Max Recs %d\n", CDFmaxRec+1);
-	if (CDFmaxRec < 10) {
+	
+	if (CDFmaxRec < 3) {
 		fprintf(stdout," %d\n", badFile);
 		exit (0);
 	}
 	if ( datatype == CDF_TIME_TT2000 ) {
-		int_value = (long long *) malloc (sizeof(long long) * (CDFmaxRec+1));
+		int_value = (long long *) malloc (sizeof(long long) * (RecCount+1));
 		/******************* Get Epoch  *************************/
 		if ((cstatus = CDFlib (SELECT_,
 								zVAR_, varN,
 								zVAR_RECNUMBER_, RecStart,
-								zVAR_RECCOUNT_, CDFmaxRec+1,
+								zVAR_RECCOUNT_, RecCount + 1,
 								zVAR_RECINTERVAL_, RecInt,
 								zVAR_DIMINDICES_, indices,
 								zVAR_DIMCOUNTS_, counts,
@@ -134,12 +102,12 @@ int main(int argc, char *argv[])
 															cdf_handle_error (cstatus);
 	}
 	else {
-		value = (double *)malloc(sizeof(double)* (CDFmaxRec+1)*((datatype == CDF_EPOCH16)+1)); 
+		value = (double *)malloc(sizeof(double)* (RecCount + 1)*((datatype == CDF_EPOCH16)+1)); 
 		/******************* Get Epoch  *************************/
 		if ((cstatus = CDFlib (SELECT_,
 								zVAR_, varN,
 								zVAR_RECNUMBER_, RecStart,
-								zVAR_RECCOUNT_, CDFmaxRec+1,
+								zVAR_RECCOUNT_, RecCount + 1,
 								zVAR_RECINTERVAL_, RecInt,
 								zVAR_DIMINDICES_, indices,
 								zVAR_DIMCOUNTS_, counts,
@@ -147,46 +115,35 @@ int main(int argc, char *argv[])
 								GET_, zVAR_HYPERDATA_, value,  NULL_)) != CDF_OK) 
 															cdf_handle_error (cstatus);
 	}
-	
-  
-	delta = (int *)malloc(sizeof(int)* CDFmaxRec);
-	for (i = 1; i < CDFmaxRec+1; i++)  
-	{
+	
 		if (datatype == CDF_TIME_TT2000) {
-			dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[i-1]);
-			dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[i]);
-			delta[i-1] = (int)(dbl_value - dbl_value_ + 50)/100;
+			dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[0]);
+			dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[1]);
+			sampling = (int)(dbl_value - dbl_value_ + 50)/100;
 		}
 		else {
 			if (datatype == CDF_EPOCH16) {
-				epoch16[0] = value[2*(i-1)];
-				epoch16[1] = value[2*(i-1)+1];
+				epoch16[0] = value[0];
+				epoch16[1] = value[1];
 				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
-				value[i-1] = computeEPOCH(year, month, day, hour, minute, sec, msec);
-				epoch16[0] = value[2*i];
-				epoch16[1] = value[2*i+1];
+				value[0] = computeEPOCH(year, month, day, hour, minute, sec, msec);
+				epoch16[0] = value[2];
+				epoch16[1] = value[3];
 				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
-				value[i] = computeEPOCH(year, month, day, hour, minute, sec, msec);
+				value[1] = computeEPOCH(year, month, day, hour, minute, sec, msec);
 			}
-			delta[i-1] = (int)(value[i] - value[i-1] + 50)/100;
+			sampling = (int)(value[1] - value[0] + 50)/100;
 		}
-	}
+
 	// fprintf(stdout,"value %f\n", value[11]-value[10]);
 	if (datatype == CDF_TIME_TT2000) free(int_value); 
 	else free(value);
-	// fprintf(stdout,"delta %d\n", delta[0]);
-	numEnough = CDFmaxRec/10; 
-	while (min[1] <  numEnough) {
-		fprintf(stdout,"minFalse %d\n", minFalse);
-		find_min(delta, CDFmaxRec, minFalse, min); 
-		minFalse = min[0];
-	}
+
-	free(delta); 
 	if ((cstatus = CDFlib(CLOSE_, CDF_, NULL_)) != CDF_OK)
 										cdf_handle_error (cstatus);
 	//   fprintf(stdout,"%d %f\n",min[1], (float)min[0]/100.0);
-	fprintf(stdout,"%f\n",(float)min[0]/10.0); 
+	fprintf(stdout,"%f\n",(float)sampling/10.0); 
 }
@@ -0,0 +1,192 @@
+/* $Id: timeResFromData.c,v 1.1 2010/08/31 10:32:55 budnik Exp $ */
+
+/** @file timeResFromData.c
+*   @brief Function to get CDAWEB dataset sampling times from data files
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <cdf.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+
+#define fileName "temp.cdf"
+#define badFile -100
+
+/*************************************
+   Global variables and structures
+**************************************/
+long  CDFDims,                                   // Number of dimensions in a CDF file
+	CDFVars,                                      // Number of variables in a CDF file
+	CDFDimSizes[CDF_MAX_DIMS],                    // Dimension Sizes in a CDF file
+	CDFencoding,                                  // Data encoding
+	CDFmajority,                                  // Variable majority
+	CDFmaxRec,                                    // max Record number
+	CDFAttrs;                                     // number of CDF Attributes
+//   CDFdatatype;
+
+struct cdfvar {                              // CDF variable structure
+	char name[CDF_VAR_NAME_LEN+1];
+	long num;                               //variable number
+	long datatype;
+	long numElem;                           // variable dimensionality
+	long recVariance;                       // variable rec Variance
+	long dimVariances[CDF_MAX_DIMS];        // # of data values in dimSizes
+} cdfVar;
+
+/*--------------------------------------------------------------------------
+ *  Handles a CDF error.
+ *--------------------------------------------------------------------------*/
+void cdf_handle_error(CDFstatus status)
+{
+	char  message[CDF_STATUSTEXT_LEN+1];
+
+	CDFerror (status, message);              /* Get the appropriate message */
+	fprintf  (stderr, "%s\n", message);
+	exit(1);
+}
+
+void find_min(int* delta, int nRecs, int minFalse, int* minVal)
+{
+	int i, n, min;
+
+	n = 1;
+	i = 0;
+	while (abs(delta[i]) <= minFalse) i++;
+	if (i < nRecs) {
+		min = abs(delta[i]); 
+		// printf(" first MIN %d \n", min);
+		for (i = 1; i < nRecs; i++) {
+			//   printf(" delta %d \n", delta[i]);
+			if (delta[i] == min) n++;
+			if (delta[i] < min && delta[i] > minFalse) {
+					min = delta[i];
+					n = 1;
+			}
+		}
+	} else {
+		min = -10;
+		n = nRecs;
+	}
+	
+	minVal[0] = min;
+	minVal[1] = n; 
+	printf(" MIN %d %d\n", min, n);
+}
+
+int main(int argc, char *argv[])
+{
+	long RecStart = 0, RecCount, RecInt = 1;
+	long indices[1] = {0}, intervals[1] = {1}, counts[1] = {1};
+	long varN = -1;  
+	long datatype = 0, attrN, maxEntry;
+	CDFstatus   cstatus;           // CDF status code
+	CDFid id;
+	double *value;
+	int *delta;
+	int i, minFalse = 0, numEnough;
+	int min[2] = {0, 0};
+	char attrValue[300];
+	float Sampling;
+	double epoch16[2], dbl_value, dbl_value_;
+	long year, month, day, hour, minute, sec, msec, mksec, nsec, psec; 
+	long long *int_value;
+    
+/*********************** Open CDF file *****************************/
+	if ((cstatus = CDFopen(fileName, &id))  != CDF_OK)
+										cdf_handle_error(cstatus);
+ 
+/*********** treat all vars as zVars with eliminated false dimensionality and get Nrecs **********/
+    
+	if ((cstatus = CDFlib(SELECT_, CDF_zMODE_, zMODEon2, NULL_)) != CDF_OK)
+										cdf_handle_error (cstatus);
+	
+    while (datatype != CDF_EPOCH && datatype != CDF_EPOCH16 && datatype != CDF_TIME_TT2000){
+		varN++;
+		if ((cstatus = CDFlib(SELECT_, zVAR_, varN,
+									GET_, zVAR_DATATYPE_, &datatype, NULL_)) != CDF_OK)
+																	cdf_handle_error (cstatus);  
+		//     if (datatype == CDF_EPOCH16)  break;
+	}
+	fprintf(stdout,"DATATYPE %d %d\n", varN, datatype);
+	if ((cstatus = CDFlib(SELECT_, zVAR_, varN,
+								GET_, zVAR_MAXREC_, &CDFmaxRec, NULL_)) != CDF_OK)
+										cdf_handle_error (cstatus);
+
+	fprintf(stdout,"Max Recs %d\n", CDFmaxRec+1);
+	if (CDFmaxRec < 10) {
+		fprintf(stdout," %d\n", badFile);
+		exit (0);
+	}
+	
+	if ( datatype == CDF_TIME_TT2000 ) {
+		int_value = (long long *) malloc (sizeof(long long) * (CDFmaxRec+1));
+		/******************* Get Epoch  *************************/
+		if ((cstatus = CDFlib (SELECT_,
+								zVAR_, varN,
+								zVAR_RECNUMBER_, RecStart,
+								zVAR_RECCOUNT_, CDFmaxRec+1,
+								zVAR_RECINTERVAL_, RecInt,
+								zVAR_DIMINDICES_, indices,
+								zVAR_DIMCOUNTS_, counts,
+								zVAR_DIMINTERVALS_, intervals,
+								GET_, zVAR_HYPERDATA_, int_value,  NULL_)) != CDF_OK) 
+															cdf_handle_error (cstatus);
+	}
+	else {
+		value = (double *)malloc(sizeof(double)* (CDFmaxRec+1)*((datatype == CDF_EPOCH16)+1)); 
+		/******************* Get Epoch  *************************/
+		if ((cstatus = CDFlib (SELECT_,
+								zVAR_, varN,
+								zVAR_RECNUMBER_, RecStart,
+								zVAR_RECCOUNT_, CDFmaxRec+1,
+								zVAR_RECINTERVAL_, RecInt,
+								zVAR_DIMINDICES_, indices,
+								zVAR_DIMCOUNTS_, counts,
+								zVAR_DIMINTERVALS_, intervals,
+								GET_, zVAR_HYPERDATA_, value,  NULL_)) != CDF_OK) 
+															cdf_handle_error (cstatus);
+	}
+	
+
+  
+	delta = (int *)malloc(sizeof(int)* CDFmaxRec);
+	for (i = 1; i < CDFmaxRec+1; i++)  
+	{
+		if (datatype == CDF_TIME_TT2000) {
+			dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[i-1]);
+			dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[i]);
+			delta[i-1] = (int)(dbl_value - dbl_value_ + 50)/100;
+		}
+		else {
+			if (datatype == CDF_EPOCH16) {
+				epoch16[0] = value[2*(i-1)];
+				epoch16[1] = value[2*(i-1)+1];
+				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
+				value[i-1] = computeEPOCH(year, month, day, hour, minute, sec, msec);
+				epoch16[0] = value[2*i];
+				epoch16[1] = value[2*i+1];
+				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
+				value[i] = computeEPOCH(year, month, day, hour, minute, sec, msec);
+			}
+			delta[i-1] = (int)(value[i] - value[i-1] + 50)/100;
+		}
+	}
+	// fprintf(stdout,"value %f\n", value[11]-value[10]);
+	if (datatype == CDF_TIME_TT2000) free(int_value); 
+	else free(value);
+	// fprintf(stdout,"delta %d\n", delta[0]);
+	numEnough = CDFmaxRec/10; 
+	while (min[1] <  numEnough) {
+		fprintf(stdout,"minFalse %d\n", minFalse);
+		find_min(delta, CDFmaxRec, minFalse, min); 
+		minFalse = min[0];
+	}
+     
+	free(delta); 
+	if ((cstatus = CDFlib(CLOSE_, CDF_, NULL_)) != CDF_OK)
+										cdf_handle_error (cstatus);
+
+	//   fprintf(stdout,"%d %f\n",min[1], (float)min[0]/100.0);
+	fprintf(stdout,"%f\n",(float)min[0]/10.0); 
+}
@@ -0,0 +1,292 @@
+/**
+*  @file cdfvarinfo.c
+*  @version $Id: cdfvarinfo.c,v 1.1 2010/08/31 10:32:55 budnik Exp $
+*  @brief  
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cdf.h>
+#include <string.h>
+
+#define MAX_FILE_NAME_LEN  120  
+
+void cdf_status_handler (CDFstatus, char *); 
+char * cdf_str_datatype (long);
+
+typedef struct cdfvar {           /* CDF variable structure */
+	char name[CDF_VAR_NAME_LEN+1];   
+	long datatype;                   
+	long numElements;                /* string length for CDF_CHAR, 1 otherwise */
+	long dimensionality;             /* variable dimensionality                 */
+	long dimSizes[CDF_MAX_DIMS];     /* variable dimension sizes                */
+	long recVariance;                /* record variance                         */
+	long numRecs;                    /* # of records this variable contains     */
+} CDFvar;
+
+int main(int argc, char *argv[])
+{
+  
+	CDFvar var;
+	CDFid    id;                     /* CDF file ID      */ 
+	CDFstatus   status;              /* CDF status code */
+
+	long nZvars, nAttrs, attrId, attrScope, varId, datatype, numElements; 
+	char attrName[CDF_ATTR_NAME_LEN+1];
+	char fileName[MAX_FILE_NAME_LEN], varName[CDF_VAR_NAME_LEN+1], attName[CDF_ATTR_NAME_LEN+1];
+	char msg[100];
+	int dummy, i;
+	char          *cPtr;
+	signed char   *scPtr;
+	short         *sPtr;
+	int           *iPtr;
+	float         *fPtr;
+	double        *dPtr;
+  
+  
+	if (argc <= 3) 
+		exit(0);                          /* CDF input file name not specified */
+	else {
+		strcpy(fileName, argv[1]);       /* Get the input file name */
+		strcpy(varName, argv[2]);
+		strcpy(attName, argv[3]);
+	}
+
+	status = CDFlib (OPEN_, CDF_, fileName, &id,  NULL_);   
+		
+	if (status != CDF_OK)  {
+			strcpy(msg, "OPEN_, CDF_, ");       
+			strcat(msg, fileName);
+			cdf_status_handler (status, msg);
+	}
+ 
+ /*---------------------------------------------------------------------------
+ *   This routine retrievs the following information:
+ *
+ *      nAttr - number of attributes (including global and variable)
+ *      nZvars - number of zVariables
+ *
+ *   CDF file can have both rVariables (old style) and zVariables (new style)
+ *   simultaneously.  zVariable is a superset of rVariable, and it is a lot
+ *   more efficient and offers all the functionality a rVariable offers and 
+ *   more.  Treat all CDF variables as zVariables.
+ *--------------------------------------------------------------------------*/ 
+ 
+	status = CDFlib (SELECT_, CDF_zMODE_, zMODEon2,
+							GET_, CDF_NUMATTRS_,  &nAttrs, 
+							CDF_NUMzVARS_,  &nZvars, 
+							NULL_);
+	if (status != CDF_OK) cdf_status_handler(status, "GET_, CDF_FILEINFO_");
+  
+	// printf(" nAttrs %d Zvars %d\n",nAttrs, nZvars);   
+	//  printf ("Attributes:\n");
+  
+	for (attrId = 0; attrId < nAttrs; attrId++) {
+		status = CDFlib (SELECT_, ATTR_, attrId,
+								GET_, ATTR_NAME_, attrName,  ATTR_SCOPE_, &attrScope,
+								NULL_);
+		
+		if (status != CDF_OK) cdf_status_handler (status, "SELECT_, ATTR_");     
+		//    printf("Attr %d  %s  %d\n", attrId, attrName, attrScope); 
+		}
+    
+	//   printf ("Variables:\n"); 
+	for (varId=0; varId < nZvars; varId++) 
+	{      
+		status = CDFlib (SELECT_,zVAR_, varId,
+								GET_, zVAR_NAME_, var.name,
+								zVAR_DATATYPE_, &var.datatype,
+								zVAR_NUMELEMS_, &var.numElements,
+								zVAR_NUMDIMS_, &var.dimensionality,
+								zVAR_DIMSIZES_, var.dimSizes,
+								zVAR_NUMRECS_, &var.numRecs,
+								zVAR_RECVARY_, &var.recVariance,
+								NULL_);   
+		if (status != CDF_OK) cdf_status_handler (status, "GET_, zVARS_");
+   
+		if (strcmp(var.name, varName) == 0) 
+		{  
+			for (attrId = 0; attrId < nAttrs; attrId++) {   
+				status = CDFlib (SELECT_, ATTR_, attrId,
+										GET_,    ATTR_NAME_, attrName, ATTR_SCOPE_, &attrScope,
+										NULL_);
+ 
+				if (status != CDF_OK) cdf_status_handler (status, "SELECT_, ATTR_");
+				if (attrScope == GLOBAL_SCOPE) continue;
+				if (strcasecmp(attrName, attName) != 0) continue;
+				
+				// printf("%d %s ", attrId, attrName);
+				
+				status = CDFlib (SELECT_, zENTRY_, varId,
+										GET_,    zENTRY_DATATYPE_, &datatype,
+										zENTRY_NUMELEMS_, &numElements,
+										NULL_);
+				//printf("%d %s", numElements,cdf_str_datatype(datatype));						
+				if (status == NO_SUCH_ENTRY) continue;    
+
+				if (status != CDF_OK) cdf_status_handler (status,"GET_ATTR_INFO_");
+ 
+				switch (datatype) 
+				{
+					case CDF_CHAR:
+						cPtr = (char *) malloc(numElements * sizeof(char) + 1);
+						
+						status = CDFlib (GET_, zENTRY_DATA_, cPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);
+						strcpy(&cPtr[numElements],"\0"); 
+						printf("%s\n", cPtr);       
+						free(cPtr);
+					break;
+
+					case CDF_BYTE:
+					case CDF_INT1:
+						scPtr = (signed char *) malloc (sizeof(signed char) * numElements);				     
+						status = CDFlib (GET_, zENTRY_DATA_, scPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);				     	     
+						free (scPtr);
+					break;
+
+					case CDF_INT2:
+					case CDF_UCHAR:
+					case CDF_UINT1:
+						sPtr = (short *) malloc (sizeof(short) * numElements);				     
+						status = CDFlib (GET_, zENTRY_DATA_, sPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);
+						free (sPtr);
+					break;
+
+					case CDF_INT4:
+					case CDF_UINT2:
+						iPtr = (int *) malloc (sizeof(int) * numElements);				    
+						status = CDFlib (GET_, zENTRY_DATA_, iPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);		
+						printf("%d\n",  *iPtr); 
+						free (iPtr);
+					break;
+
+					case CDF_FLOAT:
+					case CDF_REAL4:
+						fPtr = (float *) malloc (sizeof(float) * numElements);				     
+						status = CDFlib (GET_, zENTRY_DATA_, fPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);
+						printf("%8.1e\n",  *fPtr); 
+						free (fPtr);
+					break;
+
+					case CDF_DOUBLE:
+					case CDF_REAL8:
+					case CDF_UINT4:
+						dPtr = (double *) malloc (sizeof(double) * numElements);
+						
+						status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);
+						printf("%8.1e\n",  *dPtr); 
+						free (dPtr);
+					break;
+
+					case CDF_EPOCH:       /* 8-byte real number */ 
+						dPtr = (double *) malloc (sizeof(double) * numElements);
+						
+						status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);
+						
+						free (dPtr);
+					break;
+
+					case CDF_EPOCH16:       /* 16-byte real number */
+						dPtr = (double *) malloc (sizeof(double) * numElements * 2);				     
+						status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
+						if (status != CDF_OK) cdf_status_handler (status, msg);				      
+						free (dPtr);
+					break;
+
+					default:
+						printf ("** Error in get_cdf_attribute: bad data type");
+				}    
+			}
+			break;  
+		}
+	}
+               
+	/* Close the CDF file */
+	status = CDFlib (CLOSE_, CDF_, NULL_);   
+     
+}
+
+
+void cdf_status_handler (CDFstatus status, char *source)
+{
+	char  message[CDF_STATUSTEXT_LEN+1];
+
+	CDFerror (status, message);              /* Get the appropriate message */
+
+	if (status < CDF_WARN) {
+			printf ("An error has occurred, halting...\n");
+			printf ("%s\n", message);
+			printf ("** Error source: %s\n", source);
+			exit (status);
+	}
+	else if (status < CDF_OK) {
+			printf ("Warning, function may not have compeleted as expected...\n");
+			printf ("%s\n", message);
+	}
+	else if (status > CDF_OK) {
+			printf ("Function compeleted successfully, but be advised that...\n");
+			printf ("%s\n", message);
+	}   
+}
+
+/*--------------------------------------------------------------------------
+ *  This routine returns the string representation of the given CDF 
+ *  datatype.
+ *--------------------------------------------------------------------------*/
+char *  cdf_str_datatype (long type)
+{
+	switch (type) {
+	case CDF_BYTE:
+		return "CDF_BYTE";
+
+	case CDF_INT1:
+		return "CDF_INT1";
+
+	case CDF_CHAR:
+		return "CDF_CHAR";
+
+	case CDF_INT2:
+		return "CDF_INT2";
+
+	case CDF_UCHAR:
+		return "CDF_UCHAR";
+
+	case CDF_UINT1:
+		return "CDF_UINT1";
+
+	case CDF_INT4:
+		return "CDF_INT4";
+
+	case CDF_UINT2:
+		return "CDF_UINT2";
+
+	case CDF_FLOAT:
+		return "CDF_FLOAT";
+
+	case CDF_REAL4:
+		return "CDF_REAL4";
+
+	case CDF_DOUBLE:
+		return "CDF_DOUBLE";
+
+	case CDF_REAL8:
+		return "CDF_REAL8";
+
+	case CDF_UINT4:
+		return "CDF_UINT4";
+
+	case CDF_EPOCH:
+		return "CDF_EPOCH";
+
+	case CDF_EPOCH16:
+		return "CDF_EPOCH16";
+	}
+}
@@ -16,49 +16,42 @@ void cdf_status_handler (CDFstatus, char *);
 char * cdf_str_datatype (long);
 typedef struct cdfvar {           /* CDF variable structure */
-     char name[CDF_VAR_NAME_LEN+1];   
-     long datatype;                   
-     long numElements;                /* string length for CDF_CHAR, 1 otherwise */
-     long dimensionality;             /* variable dimensionality                 */
-     long dimSizes[CDF_MAX_DIMS];     /* variable dimension sizes                */
-     long recVariance;                /* record variance                         */
-     long numRecs;                    /* # of records this variable contains     */
+	char name[CDF_VAR_NAME_LEN+1];   
+	long datatype;                   
+	long numElements;                /* string length for CDF_CHAR, 1 otherwise */
+	long dimensionality;             /* variable dimensionality                 */
+	long dimSizes[CDF_MAX_DIMS];     /* variable dimension sizes                */
+	long recVariance;                /* record variance                         */
+	long numRecs;                    /* # of records this variable contains     */
 } CDFvar;
 int main(int argc, char *argv[])
-{
-  
-  CDFvar var;
-  CDFid    id;                     /* CDF file ID      */ 
-  CDFstatus   status;              /* CDF status code */
-   
-  long nZvars, nAttrs, attrId, attrScope, varId, datatype, numElements; 
-  char attrName[CDF_ATTR_NAME_LEN+1];
-  char fileName[MAX_FILE_NAME_LEN], varName[CDF_VAR_NAME_LEN+1];
-  char   msg[100];
-  int dummy, i;
-  char          *cPtr;
-  signed char   *scPtr;
-  short         *sPtr;
-  int           *iPtr;
-  float         *fPtr;
-  double        *dPtr;
+{  
+	CDFvar var;
+	CDFid    id;                     /* CDF file ID      */ 
+	CDFstatus   status;              /* CDF status code */
+
+	long nZvars, nAttrs, attrId, attrScope, varId, datatype, numElements; 
+	char attrName[CDF_ATTR_NAME_LEN+1];
+	char fileName[MAX_FILE_NAME_LEN], varName[CDF_VAR_NAME_LEN+1];
+	char   msg[100];
+	int dummy, i;
-    if (argc <= 2) 
-       exit(0);                   /* CDF input file name not specified */
-    else {
-        strcpy(fileName, argv[1]);       /* Get the input file name */
-	strcpy(varName, argv[2]);   
-    }	
+	if (argc <= 2) 
+		exit(0);                   /* CDF input file name not specified */
+	else {
+		strcpy(fileName, argv[1]);       /* Get the input file name */
+		strcpy(varName, argv[2]);   
+	}
-   status = CDFlib (OPEN_, CDF_, fileName, &id,  NULL_);   
+	status = CDFlib (OPEN_, CDF_, fileName, &id,  NULL_);   
-   if (status != CDF_OK)  {
-       strcpy(msg, "OPEN_, CDF_, ");       
-       strcat(msg, fileName);
-       cdf_status_handler (status, msg);
-   }
+	if (status != CDF_OK)  {
+		strcpy(msg, "OPEN_, CDF_, ");       
+		strcat(msg, fileName);
+		cdf_status_handler (status, msg);
+	}
  /*---------------------------------------------------------------------------
  *   This routine retrievs the following information:
@@ -72,225 +65,114 @@ int main(int argc, char *argv[])
  *   more.  Treat all CDF variables as zVariables.
  *--------------------------------------------------------------------------*/ 
-  status = CDFlib (SELECT_, CDF_zMODE_, zMODEon2,
-                     GET_, CDF_NUMATTRS_,  &nAttrs, 
-                           CDF_NUMzVARS_,  &nZvars, 
-                     NULL_);
-  if (status != CDF_OK) cdf_status_handler(status, "GET_, CDF_FILEINFO_");
-  
- // printf(" nAttrs %d Zvars %d\n",nAttrs, nZvars); 
-  
-//  printf ("Attributes:\n");
-  
-  for (attrId = 0; attrId < nAttrs; attrId++) {
-         status = CDFlib (SELECT_, ATTR_, attrId,
-                          GET_, ATTR_NAME_, attrName,  ATTR_SCOPE_, &attrScope,
-                          NULL_);
-         if (status != CDF_OK) cdf_status_handler (status, "SELECT_, ATTR_");     
-      
-         
-  //    printf("Attr %d  %s  %d\n", attrId, attrName, attrScope); 
-    }
-    
- //   printf ("Variables:\n"); 
-    for (varId=0; varId < nZvars; varId++) {
-      
-        status = CDFlib (SELECT_,zVAR_, varId,
-                         GET_, zVAR_NAME_, var.name,
-                               zVAR_DATATYPE_, &var.datatype,
-                               zVAR_NUMELEMS_, &var.numElements,
-                               zVAR_NUMDIMS_, &var.dimensionality,
-                               zVAR_DIMSIZES_, var.dimSizes,
-                               zVAR_NUMRECS_, &var.numRecs,
-                               zVAR_RECVARY_, &var.recVariance,
-                         NULL_);   
-        if (status != CDF_OK) cdf_status_handler (status, "GET_, zVARS_");
+	status = CDFlib (SELECT_, CDF_zMODE_, zMODEon2,
+							GET_, CDF_NUMATTRS_,  &nAttrs, 
+							CDF_NUMzVARS_,  &nZvars, 
+							NULL_);
+	
+	if (status != CDF_OK) cdf_status_handler(status, "GET_, CDF_FILEINFO_");
+
+	for (varId=0; varId < nZvars; varId++) 
+	{
+		status = CDFlib (SELECT_,zVAR_, varId,
+								GET_, zVAR_NAME_, var.name,
+								zVAR_DATATYPE_, &var.datatype,
+								zVAR_NUMELEMS_, &var.numElements,
+								zVAR_NUMDIMS_, &var.dimensionality,
+								zVAR_DIMSIZES_, var.dimSizes,
+								zVAR_NUMRECS_, &var.numRecs,
+								zVAR_RECVARY_, &var.recVariance,
+								NULL_);
+		
+		if (status != CDF_OK) cdf_status_handler (status, "GET_, zVARS_");
-        if (strcmp(var.name, varName) == 0) { 
-	  
-	                    printf("%s %d %d ", cdf_str_datatype(var.datatype), var.dimensionality, var.numRecs);
-			    for (i = 0; i < var.dimensionality; i++) printf("%d ",var.dimSizes[i]);
-			    printf("\n");
-			    
-			    for (attrId = 0; attrId < nAttrs; attrId++) {   
-			          status = CDFlib (SELECT_, ATTR_, attrId,
-                                                   GET_,    ATTR_NAME_, attrName,
-                                                   ATTR_SCOPE_, &attrScope,
-                                                   NULL_);
- 						   
-                                  if (status != CDF_OK) cdf_status_handler (status, "SELECT_, ATTR_");
-			          if (attrScope == GLOBAL_SCOPE) continue;
-//printf("\n%d %s ", attrId, attrName);			      
-	                          status = CDFlib (SELECT_, zENTRY_, varId,
-                                                GET_,    zENTRY_DATATYPE_, &datatype,
-                                                      zENTRY_NUMELEMS_, &numElements,
-                                                NULL_);
-//printf("%d %s", numElements,cdf_str_datatype(datatype));						
-				if (status == NO_SUCH_ENTRY) continue;    
-
-                                if (status != CDF_OK) cdf_status_handler (status,"GET_ATTR_INFO_");
-				 
-			        switch (datatype) {
-				     case CDF_CHAR:
-				      cPtr = (char *) malloc(numElements * sizeof(char) + 1);				     
-				      status = CDFlib (GET_, zENTRY_DATA_, cPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);	
-//				      printf(" %s",  cPtr);       
-				      free(cPtr);
-				      break;
-
-				  case CDF_BYTE:
-				  case CDF_INT1:
-				      scPtr = (signed char *) malloc (sizeof(signed char) * numElements);				     
-				      status = CDFlib (GET_, zENTRY_DATA_, scPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);				     	     
-				      free (scPtr);
-				      break;
-
-				  case CDF_INT2:
-				  case CDF_UCHAR:
-				  case CDF_UINT1:
-				      sPtr = (short *) malloc (sizeof(short) * numElements);				     
-				      status = CDFlib (GET_, zENTRY_DATA_, sPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);				     
-				      free (sPtr);
-				      break;
-
-				  case CDF_INT4:
-				  case CDF_UINT2:
-				      iPtr = (int *) malloc (sizeof(int) * numElements);				    
-				      status = CDFlib (GET_, zENTRY_DATA_, iPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);				     
-				      free (iPtr);
-				      break;
-
-				  case CDF_FLOAT:
-				  case CDF_REAL4:
-				      fPtr = (float *) malloc (sizeof(float) * numElements);				     
-				      status = CDFlib (GET_, zENTRY_DATA_, fPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);				      
-				      free (fPtr);
-				      break;
-
-				  case CDF_DOUBLE:
-				  case CDF_REAL8:
-				  case CDF_UINT4:
-				      dPtr = (double *) malloc (sizeof(double) * numElements);
-				     
-				      status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);
-				     
-				      free (dPtr);
-				      break;
-
-				  case CDF_EPOCH:       /* 8-byte real number */ 
-				      dPtr = (double *) malloc (sizeof(double) * numElements);
-				     
-				      status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);
-				     
-				      free (dPtr);
-				      break;
-
-				  case CDF_EPOCH16:       /* 16-byte real number */
-				      dPtr = (double *) malloc (sizeof(double) * numElements * 2);				     
-				      status = CDFlib (GET_, zENTRY_DATA_, dPtr, NULL_);
-				      if (status != CDF_OK) cdf_status_handler (status, msg);				      
-				      free (dPtr);
-				      break;
-
-				  default:
-					  printf ("** Error in get_cdf_attribute: bad data type");
-				  }
-				    
-          }
-        break;  
+		if (strcmp(var.name, varName) == 0) 
+		{  
+			printf("%s %d %d ", cdf_str_datatype(var.datatype), var.dimensionality, var.numRecs);
+			for (i = 0; i < var.dimensionality; i++) printf("%d ",var.dimSizes[i]);
+			
+			printf("\n");      
+			break;  
+		}
 	}
-     }
-     
-     
-     
-    /* Close the CDF file */
-    status = CDFlib (CLOSE_, CDF_, NULL_);   
-     
+	
+	/* Close the CDF file */
+	status = CDFlib (CLOSE_, CDF_, NULL_);        
 }
-
-
 void cdf_status_handler (CDFstatus status, char *source)
 {
-   char  message[CDF_STATUSTEXT_LEN+1];
+	char  message[CDF_STATUSTEXT_LEN+1];
-   CDFerror (status, message);              /* Get the appropriate message */
+	CDFerror (status, message);              /* Get the appropriate message */
-   if (status < CDF_WARN) {
-       printf ("An error has occurred, halting...\n");
-       printf ("%s\n", message);
-       printf ("** Error source: %s\n", source);
-       exit (status);
-   }
-   else if (status < CDF_OK) {
-       printf ("Warning, function may not have compeleted as expected...\n");
-       printf ("%s\n", message);
-   }
-   else if (status > CDF_OK) {
-       printf ("Function compeleted successfully, but be advised that...\n");
-       printf ("%s\n", message);
-   }
-   
-   
+	if (status < CDF_WARN) {
+			printf ("An error has occurred, halting...\n");
+			printf ("%s\n", message);
+			printf ("** Error source: %s\n", source);
+			exit (status);
+	}
+	else if (status < CDF_OK) {
+			printf ("Warning, function may not have compeleted as expected...\n");
+			printf ("%s\n", message);
+	}
+	else if (status > CDF_OK) {
+			printf ("Function compeleted successfully, but be advised that...\n");
+			printf ("%s\n", message);
+	}   
 }
+
 /*--------------------------------------------------------------------------
  *  This routine returns the string representation of the given CDF 
  *  datatype.
  *--------------------------------------------------------------------------*/
 char *  cdf_str_datatype (long type)
 {
-    switch (type) {
-      case CDF_BYTE:
-         return "CDF_BYTE";
+	switch (type) {
+	case CDF_BYTE:
+		return "CDF_BYTE";
-      case CDF_INT1:
-         return "CDF_INT1";
+	case CDF_INT1:
+		return "CDF_INT1";
-      case CDF_CHAR:
-         return "CDF_CHAR";
+	case CDF_CHAR:
+		return "CDF_CHAR";
-      case CDF_INT2:
-         return "CDF_INT2";
+	case CDF_INT2:
+		return "CDF_INT2";
-      case CDF_UCHAR:
-         return "CDF_UCHAR";
+	case CDF_UCHAR:
+		return "CDF_UCHAR";
-      case CDF_UINT1:
-         return "CDF_UINT1";
+	case CDF_UINT1:
+		return "CDF_UINT1";
-      case CDF_INT4:
-         return "CDF_INT4";
+	case CDF_INT4:
+		return "CDF_INT4";
-      case CDF_UINT2:
-         return "CDF_UINT2";
+	case CDF_UINT2:
+		return "CDF_UINT2";
-      case CDF_FLOAT:
-         return "CDF_FLOAT";
+	case CDF_FLOAT:
+		return "CDF_FLOAT";
-      case CDF_REAL4:
-         return "CDF_REAL4";
+	case CDF_REAL4:
+		return "CDF_REAL4";
-      case CDF_DOUBLE:
-         return "CDF_DOUBLE";
+	case CDF_DOUBLE:
+		return "CDF_DOUBLE";
-      case CDF_REAL8:
-         return "CDF_REAL8";
+	case CDF_REAL8:
+		return "CDF_REAL8";
-      case CDF_UINT4:
-         return "CDF_UINT4";
+	case CDF_UINT4:
+		return "CDF_UINT4";
-      case CDF_EPOCH:
-         return "CDF_EPOCH";
+	case CDF_EPOCH:
+		return "CDF_EPOCH";
-      case CDF_EPOCH16:
-         return "CDF_EPOCH16";
-    }
-}
+	case CDF_EPOCH16:
+		return "CDF_EPOCH16";
+	}
+}
 \ No newline at end of file
@@ -0,0 +1,76 @@
+/*
+ * get parameter info from nc file
+ * args : ncfile varId infoId
+ * infoId :
+ * UNITS
+ * FILLVALUE
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netcdf.h>
+ 
+void check(int stat) 
+{
+	if (stat != NC_NOERR) 
+	{
+		printf("error: %s\n", nc_strerror(stat));
+		exit(1);
+	}
+} 
+ 
+main(int argc, char **argv)
+{
+	int ncID, varID;
+	size_t i, k;
+//	char varname[NC_MAX_NAME];
+	int stat = 0;
+	nc_type xtype;
+	char name_in[NC_MAX_NAME];
+	float number_attr;
+	int nattsp;
+
+	if (argc <= 3) {
+		printf("Incorrect number of arguments\n"); 
+		exit(1);
+	}
+	
+	check(nc_open(argv[1],NC_WRITE|NC_SHARE,&ncID));
+
+	check(nc_inq_varid(ncID, argv[2], &varID));
+	check(nc_inq_varnatts(ncID, varID, &nattsp));
+	// fprintf(stdout, "%d\n", nattsp);
+	
+	for (i = 0; i < nattsp; i++) {
+		check(nc_inq_attname(ncID, varID, i, name_in));
+		 
+		if (strcasecmp(name_in, argv[3]) == 0) { 
+
+			check(nc_inq_atttype(ncID, varID, name_in, &xtype));
+			
+			if (xtype == NC_CHAR) {
+				size_t attlen = 0;
+				check(nc_inq_attlen(ncID, varID, name_in, &attlen));
+				unsigned char *string_attr = (unsigned char *)malloc(attlen * sizeof(char*) + 1);	
+				 
+				check(nc_get_att(ncID, varID, name_in, string_attr));
+				strcpy(&string_attr[attlen],"\0"); 
+				fprintf(stdout, "%s\n",  string_attr);	
+				free(string_attr);
+			}
+			else {
+				check(nc_get_att(ncID, varID, name_in, &number_attr));
+				fprintf(stdout, "%e\n",  number_attr);	
+			}
+			
+			exit(0);
+		}
+	}
+	
+	stat = nc_close(ncID);
+	fprintf(stdout, "undefined\n");
+	exit(0);
+}
+
+
@@ -112,11 +112,23 @@
 	$nonStd = $_POST['nonstd'] ?  $_POST['nonstd'] : null;
 	$timeLength = $_POST['timelength'] ?  $_POST['timelength'] : null;
 	$doy = isset($_POST['doy']) ?  $_POST['doy'] : null;
+	$sampling =  isset($_POST['smpl']) ?  $_POST['smpl'] : null;
+	$min_sampling = isset($_POST['min_manual_sampling']) ?  $_POST['min_manual_sampling'] : null;
+	$max_sampling = isset($_POST['max_manual_sampling']) ?  $_POST['max_manual_sampling'] : null;
+	
+	if ($sampling == "auto" && $timeSmplg == "variable" 
+				&&  (strtolower($fileFrmt) == "cdf" || strtolower($fileFrmt) == "nc")) {	
+				$response = array('success' => false, 'error' => " : Auto-definition of variable sampling for $fileFrmt isn't implemented yet. 
+				Use manual sampling definition");
+				die(json_encode($response));
+	}
+	
 	$sampData = isset($_POST['sampData']) ? $_POST['sampData'] : null;
 	$sampFileName = isset($_POST['sampFileName']) ? $_POST['sampFileName'] : null;
 	$allFormats = array('fileFormat' => $fileFrmt, 'timeFormat' => $timeFrmt, 'doy' => $doy,
-								'timeSampling' => $timeSmplg, 'nonStandard' => $nonStd, 'timeLength' => $timeLength);
+								'timeSampling' => $timeSmplg, 'nonStandard' => $nonStd, 'timeLength' => $timeLength,
+								'samplingType' => $sampling, 'min_sampling' => $min_sampling, 'max_sampling' => $max_sampling);
 	if ($_POST['filesrc'] == 'URL') $fromURL = true;  
 	else  $fromURL = false;