Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Myriam Bouchemit
2 parents 4a6532e3 c1b60a07
Showing 5 changed files with 47 additions and 8 deletions Show diff stats
js/app/views/TableDefPlugUI.js
php/classes/AmdaAction.php
php/classes/DerivedParamMgr.php
php/classes/UserMgr.php
php/my_config.template.php
@@ -30,6 +30,8 @@ Ext.define(&#39;amdaUI.TableDefPlugUI&#39;, {
  
 	tableDefTypeCombo: null,
 	channelsDefTypeCombo: null,
+	nameField: null,
+	unitsField: null,
 	defMainPanel: null,
  
 	manualDefGrid: null,
@@ -102,6 +104,16 @@ Ext.define(&#39;amdaUI.TableDefPlugUI&#39;, {
             	}
             }
 		});
+
+		this.nameField = Ext.create('Ext.form.field.Text',{
+			fieldLabel: 'Table name',
+			name: 'name'
+		});
+
+		this.unitsField = Ext.create('Ext.form.field.Text',{
+			fieldLabel: 'Table units',
+			name: 'units'
+		});
  
 		this.defMainPanel = Ext.create('Ext.form.Panel', {
 			border: false, frame: true, plain: true,
@@ -177,6 +189,8 @@ Ext.define(&#39;amdaUI.TableDefPlugUI&#39;, {
 		    items: [
 		            this.tableDefTypeCombo,
 		            this.channelsDefTypeCombo,
+			    this.nameField,
+			    this.unitsField,
 		            this.defMainPanel
 		    ]
 		};					 
@@ -420,6 +434,8 @@ Ext.define(&#39;amdaUI.TableDefPlugUI&#39;, {
 		var obj = {
 				'tableDefType' : this.tableDefTypeCombo.getValue(),
 				'channelsDefType' : this.channelsDefTypeCombo.getValue(),
+				'tableName' : this.nameField.getValue(),
+				'tableUnits' : this.unitsField.getValue(),
 				'data' : {}
 		};
  
@@ -458,6 +474,8 @@ Ext.define(&#39;amdaUI.TableDefPlugUI&#39;, {
 	{
 		this.tableDefTypeCombo.setValue(tableDef['tableDefType']);
 		this.channelsDefTypeCombo.setValue(tableDef['channelsDefType']);
+		this.nameField.setValue(tableDef['tableName']);
+		this.unitsField.setValue(tableDef['tableUnits']);
 		this.selectTableDefType(tableDef['tableDefType']);
 		this.loadManualGridData(tableDef['channelsDefType'], tableDef['data']);
 		this.loadSelectData(tableDef['data']);
@@ -892,8 +892,12 @@ class AmdaAction
 		}
 		else {
 			// check disk space 
-			if ($dd->getWsSize() > DISK_QUOTA)
-				return array('success' => false, 'message' => 'Please clean up your workspace.<br/>No more space is available');
+			if ($dd->getWsSize() > DISK_QUOTA) {
+				//Try to delete log files - cf. #6245
+				if ($dd->getWsSize(TRUE) > DISK_QUOTA) {
+					return array('success' => false, 'message' => 'Please clean up your workspace.<br/>No more space is available');
+				}
+			}
 		}
  
 		$this->user = $dd->user;
@@ -203,6 +203,8 @@ class DerivedParamMgr extends AmdaObjectMgr
 				//add definition
 				$tableNode->setAttribute('tableDefType', $p->tableDef->tableDefType);
 				$tableNode->setAttribute('channelsDefType', $p->tableDef->channelsDefType);
+				$tableNode->setAttribute('tableName', $p->tableDef->tableName);
+				$tableNode->setAttribute('tableUnits', $p->tableDef->tableUnits);
 				if (isset($p->tableDef->data))
 				{
 					foreach ($p->tableDef->data as $key => $value)
@@ -329,13 +331,15 @@ class DerivedParamMgr extends AmdaObjectMgr
 				//load table definition
 				$tableDefType = $attribute->getAttribute('tableDefType');
 				$channelsDefType = $attribute->getAttribute('channelsDefType');
+				$tableName = $attribute->getAttribute('tableName');
+				$tableUnits = $attribute->getAttribute('tableUnits');
 				$tableData = array();
 				foreach ($attribute->childNodes as $tableDataNode)
 				{
 					if ($tableDataNode->nodeType != XML_ELEMENT_NODE) continue;
 					$tableData[$tableDataNode->tagName] = $tableDataNode->nodeValue;
 				}
-				$attributesToReturn[$attribute->tagName] = array('tableDefType' => $tableDefType, 'channelsDefType' => $channelsDefType, 'data' => $tableData);
+				$attributesToReturn[$attribute->tagName] = array('tableDefType' => $tableDefType, 'channelsDefType' => $channelsDefType, 'tableName' => $tableName, 'tableUnits' => $tableUnits, 'data' => $tableData);
 			}
 			else $attributesToReturn[$attribute->tagName] =  $attribute->nodeValue;
 		}	
@@ -661,28 +661,41 @@ class UserMgr
 		return $xml->save($file);
 	}
  
-	public function dirSize($dir) 
+	public function dirSize($dir, $files_to_delete = array()) 
 	{
 		$handle = opendir($dir);
  
 		$mas = 0;
 		while ($file = readdir($handle)) {
 			if ($file != '..' && $file != '.' && !is_dir($dir.'/'.$file)) {
+				if (in_array($file, $files_to_delete)) {
+					unlink($dir.'/'.$file);
+					continue;
+				}
 				$mas += filesize($dir.'/'.$file);
 			} 
 			else if (is_dir($dir.'/'.$file) && $file != '..' && $file != '.') {
-				$mas += $this->dirSize($dir.'/'.$file);
+				$mas += $this->dirSize($dir.'/'.$file, $files_to_delete);
 			}
 		}
 		return $mas;
 	} 
  
-	public function  getWsSize() 
+	public function  getWsSize($delete_log_files = FALSE) 
 	{
 		$dirsToCheck = array(USERDATADIR, USERTTDIR, USERWORKINGDIR);
 		$wsSize = 0;
+		if ($delete_log_files) {
+			$files_to_delete = array(
+				'example.log',
+				'cmd_output',
+			);
+		}
+		else {
+			$files_to_delete = array();
+		}
 		foreach ($dirsToCheck as $dir) 
-			if (is_dir($dir)) $wsSize += $this->dirSize($dir);
+			if (is_dir($dir)) $wsSize += $this->dirSize($dir, $files_to_delete);
  
 		return $wsSize;
 	}
@@ -15,7 +15,7 @@ define(&#39;DDSERVICE&#39;, &#39;{:DDSERVICE:}&#39;);
 // User apache
 define('APACHE_USER', '{:APACHE_USER:}');
 // Alias for name of AMDA
-define('APACHE_ALIAS', '{:APACHE_ALIAS:}');
+define('APACHE_ALIAS', '{:APACHE_ALIAS:}'); // APACHE_ALIAS with TWO slashes "/AMDA/" or ONE slash  "/"
 //email to send errors from AmdaUpdate/AmdaInstall
 define('email', '{:email:}');
 //IHM title