CDPP / AMDA_IHM

Commit 504c431a0cd11f88ed6353a97c5159d15f9b7435

Authored by Benjamin Renard
1 parent 80861345
Exists in master and in 73 other branches 10098, 10178, 5390, 6629, 7616, 8459, 8528, 9014, 9016Bis, 9084, 9326, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

Fix AmdaStats

Showing 1 changed file with 7 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaStats.php
  Diff comments   View file @504c431
@@ -16,13 +16,13 @@ class AmdaStats { @@ -16,13 +16,13 @@ class AmdaStats {
16 private $task = array('request'=>'plot','condition'=>'mining', 'download'=>'print','statistic'=>'statistics', 16 private $task = array('request'=>'plot','condition'=>'mining', 'download'=>'print','statistic'=>'statistics',
17 'getparameter'=>'ws_print', 'getdataset' => 'ws_print', 'getorbites' => 'ws_print', 'getplot' => 'ws_plot'); 17 'getparameter'=>'ws_print', 'getdataset' => 'ws_print', 'getorbites' => 'ws_print', 'getplot' => 'ws_plot');
18 18
19 - public function __construct($user) { 19 + public function __construct($user, $year = NULL) {
20 if (!is_dir(DATAPATH.'Statistics')) { 20 if (!is_dir(DATAPATH.'Statistics')) {
21 if (!mkdir(DATAPATH.'Statistics', 0775)) $this->success = false; //return -1; 21 if (!mkdir(DATAPATH.'Statistics', 0775)) $this->success = false; //return -1;
22 if (!chgrp(DATAPATH.'Statistics', APACHE_USER)) $this->success = false; // return -1; 22 if (!chgrp(DATAPATH.'Statistics', APACHE_USER)) $this->success = false; // return -1;
23 } 23 }
24 24
25 - $this->statsFilePath = $this->getStatsFilePath($user); 25 + $this->statsFilePath = $this->getStatsFilePath($user, $year);
26 } 26 }
27 27
28 public function addTask($user, $task, $vars) { 28 public function addTask($user, $task, $vars) {
@@ -45,8 +45,11 @@ class AmdaStats { @@ -45,8 +45,11 @@ class AmdaStats {
45 return $this->concurrentAccessGuestFile(array($this,'_mergeStats'), array('inXml' => $inXml)); 45 return $this->concurrentAccessGuestFile(array($this,'_mergeStats'), array('inXml' => $inXml));
46 } 46 }
47 47
48 - private function getStatsFilePath($user) {  
49 - $thisYear = date("Y"); 48 + private function getStatsFilePath($user, $year) {
  49 + if (!isset($year))
  50 + $thisYear = date("Y");
  51 + else
  52 + $thisYear = $year;
50 if (empty($user)){ 53 if (empty($user)){
51 return DATAPATH."Statistics/Stats$thisYear.xml"; 54 return DATAPATH."Statistics/Stats$thisYear.xml";
52 } 55 }