Merge amdadev into master

Benjamin Renard
2 parents 70463115 8926327f
Showing 12 changed files with 104 additions and 22 deletions Show diff stats
generic_data/Functions/functions.xml
help/ttTimeFormat
js/app/AmdaApp.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/views/PlotComponents/PlotPanelForm.js
js/app/views/TimeTableUI.js
js/app/views/UploadUI.js
php/WebServices/WebServer.php
php/classes/AmdaAction.php
php/classes/AmdaClient.php
php/classes/UserMgr.php
php/rest/getObsDataTree.php
@@ -327,6 +327,10 @@
         <info_brief>Closest integer greater than or equal to its argument</info_brief>
         <new_kernel>Ceil</new_kernel>
     </function>
+    <function name="isNaN()" kind="math" group="math">
+        <info_brief>Checks if there is a NaN value</info_brief>
+        <new_kernel>IsNaN</new_kernel>
+    </function>
     <function name="cos()" kind="math" group="math">
         <info_brief>cosine</info_brief>
         <new_kernel>cos</new_kernel>
 <h3>ASCII Time Table Time Format</h3>
-<li><i>Year Month Day Hour Minute Second</i>  => with different separators ("-", ":", "/", " ") used in a standard way.
-<br/><i>Milliseconds</i> are not taken in to account.
+<li><i>Year Month Day Hour Minute Second Millisecond</i>  => with different separators ("-", ":", "/", " ") used in a standard way.
 <br/><br/>
 Examples:
   <ul>
-    <li> 2001-01-01T00:00:00
-    <li> 2001-01-01 00:00:00
-    <li> 2001 01 01 00 00 00
-    <li> 2001/01/01 00:00:00
+    <li> 2001-01-01T00:00:00.000
+    <li> 2001-01-01 00:00:00.000
+    <li> 2001 01 01 00 00 00.000
+    <li> 2001/01/01 00:00:00.000
   </ul> 
-<li> <i>Year Day-Of-Year Hour Minute Second</i> => with different separators ("-", ":", "/", " ").
+<li> <i>Year Day-Of-Year Hour Minute Second Millisecond</i> => with different separators ("-", ":", "/", " ", ".").
 <i>Day-Of-Year</i> (three letters !!!) starts from 0, i.e. the 1st of January is 0.
 <br/><br/>
 <li>If you plan to use uploaded time table to work with data note that :<br/>
@@ -440,6 +440,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 						text : 'Reset password',
 						iconCls : 'icon-resetpwd',
 						id : 'resetpwd-win-tool',
+                        			disabled: isGuest || (sessionID == 'impex'),
 						handler : function(obj, e) {
 								e.stopEvent();
 								var moduleId = obj.el.id;
@@ -52,6 +52,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
               {name: 'panel-title-font-size', type: 'int'},
               {name: 'panel-title-font-bold', type: 'boolean'},
               {name: 'panel-title-font-italic', type: 'boolean'},
+			  {name: 'panel-showint-info', type: 'boolean'},
               {name: 'panel-plot-type', type: 'string'},
               {name: 'panel-font-activated', type: 'boolean'},
               {name: 'panel-font-name', type: 'string'},
@@ -571,6 +572,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	this.set('panel-title-font-bold', false);
     	this.set('panel-title-font-italic', false);
+
+    	this.set('panel-showint-info', false);
+
     	this.set('panel-font-activated', false);
     	this.set('panel-font-name', amdaDefaultValues.plot.panel.font.name);
     	this.set('panel-font-size', amdaDefaultValues.plot.panel.font.size);
@@ -710,6 +714,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	panelValues['panel-title-font-size'] = this.get('panel-title-font-size');
     	panelValues['panel-title-font-bold'] = this.get('panel-title-font-bold');
     	panelValues['panel-title-font-italic'] = this.get('panel-title-font-italic');
+
+    	panelValues['panel-showint-info'] = this.get('panel-showint-info');
+
     	panelValues['panel-plot-type'] = this.get('panel-plot-type');
     	panelValues['panel-font-activated'] = this.get('panel-font-activated');
     	panelValues['panel-font-name'] = this.get('panel-font-name');
@@ -152,6 +152,12 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
 		        this.addStandardFieldSet('Manual Margins', '', marginItems),
 		        this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems),
     	        this.addStandardFieldSet('Title', '', titleItems),
+
+				this.addStandardCheck('panel-showint-info', 'Show interval number', function(name, value, oldValue) {
+		        	me.object.set('panel-showint-info', value);
+	        		me.crtTree.refresh();
+		        }, 'When this option is selected, the number of the interval on the TT/Catalog is shown on plot.'), 
+
 		        this.addStandardFont('panel-font'),
 		        this.addStandardFieldSet('Status Bars', '', statusItems),
 		        this.addStandardFieldSet('Ticks Bars', '', tickItems)
@@ -197,7 +197,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             // synchronisation of objects
             this.object = ttobj;
             timeTableModule.linkedNode.create();
-        } else if (this.fclose() || this.status && (this.status.nbFiltered > 0)) /*TimeTable object has been modified*/
+        } else if (this.fclose() || this.status ) /*TimeTable object has been modified*/
         {
             if (this.object.isModified('name') || this.object.get('fromPlugin'))
             {
@@ -47,7 +47,7 @@ Ext.define(&#39;amdaUI.UploadUI&#39;, {
 				autoHide: false,
 				iconCls: 'icon-information',
 				html: 'Select local or remote file (time table, catalog) to upload<br/>File size is limited to <b><i>'
-					+ myDesktopApp.MAX_UPLOADED_FILE_SIZE/1000000+'MB</i></b><br/>Milliseconds are ignored for the moment',
+					+ myDesktopApp.MAX_UPLOADED_FILE_SIZE/1000000+'MB</i></b><br/>Milliseconds are taken into account',
 					autoScroll : true,
 				loader: {}
 			}]
@@ -50,7 +50,11 @@ class WebServer
 			$this->userPWD = $vars['password'];
 		else 
 			$this->userPWD = WSConfigClass::getAnonymousUserPwd();
-		
+
+		if (isset($vars['referenceTime']))
+			$this->referenceTime = $vars['referenceTime'];
+		else
+			$this->referenceTime = NULL;
 		return array('success' => true, 'vars' => $vars);
 	}
@@ -114,6 +118,12 @@ class WebServer
 		return $dataSetDom;
 	}
+
+	private function getUserInfo($data) 
+	{
+		$res = $this->init($data);
+		$this->initUserMgr(); 
+	}
 /*
 *  get user TimeTables list; Shared for anonymous user ('impex')
@@ -327,6 +337,42 @@ class WebServer
 		if (!$locParamSrcDom->save(WSConfigClass::getWsResultDir().$locParamDst))
 			$this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID);   
 	}
+
+    private function injectTemplateInfo($locParamFile) {
+        $paramTemplateListFile = WSConfigClass::getParamTemplateListFilePath();
+
+        $paramTemplateListFileDom = new DomDocument("1.0");
+        if (!@$paramTemplateListFileDom->load($paramTemplateListFile))
+			$this->throwError("getObsDataTree", "Cannot load  Amda Templated Parameters description file".$this->userID);
+
+        $paramTemplateNodes = $paramTemplateListFileDom->getElementsByTagName('paramTemplate');
+
+        $locParamFileDom = new DomDocument("1.0");
+		$locParamFileDom->preserveWhiteSpace = FALSE; /// Important !!! otherwise removeChild() leaves empty text nodes
+		
+		if (!@$locParamFileDom->load(WSConfigClass::getWsResultDir().$locParamFile))
+			$this->throwError("getObsDataTree", "Cannot load  Amda Local DataBase Parameters description file ".$this->userID);
+ 
+		$xp =  new domxpath($locParamFileDom);
+
+        foreach ($paramTemplateNodes as $paramTemplateNode) {
+            $paramTemplateId = $paramTemplateNode->getAttribute('paramId');
+            $paramFileName = $paramTemplateNode->getAttribute('fileName');
+            $parameterNodes = $xp->query("//parameter[@template='$paramFileName']");
+            $argumentsNodes = $paramTemplateNode->getElementsByTagName("arguments");
+            if ($argumentsNodes->length < 1)
+                continue;
+            $argumentsNode = $argumentsNodes->item(0);
+            foreach ($parameterNodes as $parameterNode) {
+                $node = $locParamFileDom->importNode($argumentsNode, TRUE);
+                $parameterNode->appendChild($node);
+            }
+        }
+
+ 
+		if (!$locParamFileDom->save(WSConfigClass::getWsResultDir().$locParamFile))
+			$this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID); 
+    }
 	private function checkInputTime($startTime, $stopTime) 
 	{
@@ -349,19 +395,26 @@ class WebServer
 /*
 *   public data only : anonymous user (impex)
 */
-	public function getObsDataTree() 
+	public function getObsDataTree($data) 
 	{         
-		$res = $this->init();	
+		$res = $this->init($data);	
 		$this->initUserMgr();
+
+        $injectTemplateInfo = array_key_exists('templateInfo', $data) && (!empty($data["templateInfo"]));
 		$locParamSrc = USERWSDIR.'LocalParams.xml'; 
-		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
+		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.($injectTemplateInfo ? 'withtemplate_' : '').$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
 // 		if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
 // 			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');   
 		$this->excludePrivateNodes($locParamSrc,$locParamDst);
+
+        if ($injectTemplateInfo) {
+            $this->injectTemplateInfo($locParamDst);
+        }
+
 		return  array('success' => true,'WorkSpace' => array("LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
 	}
@@ -299,10 +299,10 @@ class AmdaAction
 							if ($child->tagName == 'parameter') {
 								$isParameter = true;
-                                if ($child->hasAttribute('TemplatedParameter'))
+                                if ($child->hasAttribute('template'))
                                     $needsArgs = true;
-								if ($child->hasAttribute('PredefinedTemplatedParameter'))
+								if ($child->hasAttribute('predefined'))
 									$predefinedArgs = true;
 								if ($child->parentNode->hasAttribute('dataStart')) {
@@ -249,6 +249,9 @@ class AmdaClient {
 	}
     public function resetUserPwd($login, $crt_pwd, $new_pwd) {
+        if ($login == "impex" || (strpos($login, 'guest') === 0)) {
+            return array('success' => false, 'message' => "You are not authorised to change this password");
+        }
         try {
 			$data_array = array(
 				"login" => $login,
@@ -23,7 +23,7 @@ class UserMgr
 					'USERTEMPDIR' => 'TEMP');	
 	protected $userGrps;
 	protected $userGrpsCheckSum; //use to know if there is a modification in user groups
-	protected $amdaClient; //client to dd webservice
+	protected $amdaClient = NULL; //client to dd webservice
 	protected $paramMgr, $baseExtXml;
 	protected $datasetsTimeRestriction;
 	protected $datasetsTimeRestrictionCheckSum;
@@ -75,10 +75,15 @@ class UserMgr
 			$this->user = $_GET['sessionID'];
 		else if (isset($sessionID))
 			$this->user = $sessionID;
-		//TODO if AmdaClient is needed ?
-		$this->amdaClient = new AmdaClient();
 	}
+    private function getAmdaClient() {
+        if (!isset($this->amdaClient)) {
+            $this->amdaClient = new AmdaClient();
+        }
+        return $this->amdaClient;
+    }
+
 	//TODO if needed?? set session ID
 	protected function setID() {}
@@ -119,7 +124,7 @@ class UserMgr
 	// 		       "email"       => ($theUser->length > 0) ? $theUser->item(0)->getAttribute("email") : "undefined",
 	// 		       "date"        => ($theUser->length > 0) ? $theUser->item(0)->getAttribute("date")  : "undefined",
 	// 		       "news"        => ($theUser->length > 0) ? $theUser->item(0)->getAttribute("news")  : "0");
-		$info =  $this->amdaClient->getUserInfo($this->user);
+		$info =  $this->getAmdaClient()->getUserInfo($this->user);
 		$wsSize = intval($this->getWsSize()/1024./1024.);
 		$quota = intval($this->getSpecialSettings()/1024./1024.);
 		$info['total'] = $quota;
@@ -131,7 +136,7 @@ class UserMgr
     public function resetPwd($crt_pwd, $new_pwd)
     {
-        return $this->amdaClient->resetUserPwd($this->user, $crt_pwd, $new_pwd);
+        return $this->getAmdaClient()->resetUserPwd($this->user, $crt_pwd, $new_pwd);
     }
 	public function createDir() 
@@ -149,7 +154,7 @@ class UserMgr
 		if (isset($this->userGrps)) {
 			return;
 		}
-		$info = $this->amdaClient->getUserInfo($this->user); 
+		$info = $this->getAmdaClient()->getUserInfo($this->user); 
 		$this->userGrpsCheckSum = '';
 		if (!empty($info['group'])) {
@@ -179,7 +184,7 @@ class UserMgr
 		}
 		$this->datasetsTimeRestrictionCheckSum = '';
-		$this->datasetsTimeRestriction = $this->amdaClient->getDatasetsWithTimeRestriction();
+		$this->datasetsTimeRestriction = $this->getAmdaClient()->getDatasetsWithTimeRestriction();
 		if ($this->datasetsTimeRestriction !== FALSE) {
 			foreach ($this->datasetsTimeRestriction as &$datasetTimeRestriction) {
@@ -5,6 +5,10 @@
  * @apiDescription Provides the hierarchy of public access data in AMDA.
  * @apiName getObsDataTree
  * @apiGroup webservices
+ * 
+ * @apiParam {String} [userID] Identifier of the user in AMDA (*mandatory for user owned data*)
+ * @apiParam {String} [password] Password of the user in AMDA (*mandatory for user owned data*)
+ * @apiParam {Boolean} [templateInfo] `1` to include info about templated parameters - Default `0`.
  *
  * @apiSuccess {String} success true.
  * @apiSuccess {String} workspace URL of the XML file containing the list of "public" parameters in AMDA.