CDPP / AMDA_IHM

Commit be67b1227e1d2d6817e77ec7776bf44284e99b8b

Authored by Elena.Budnik
1 parent e598bdc1
Exists in master and in 109 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

stats.xml par yesr

Showing 1 changed file with 12 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaStats.php
  Diff comments   View file @be67b12
@@ -21,14 +21,17 @@ class AmdaStats { @@ -21,14 +21,17 @@ class AmdaStats {
21 $this->statXml->formatOutput = true; 21 $this->statXml->formatOutput = true;
22 22
23 if (!defined("StatsXml")){ 23 if (!defined("StatsXml")){
  24 + $thisYear = date("Y");
24 if (!$user){ 25 if (!$user){
25 // general - to read 26 // general - to read
26 - define('StatsXml',DATAPATH.'Statistics/Stats.xml'); 27 + // define('StatsXml',DATAPATH.'Statistics/Stats.xml');
  28 + define("StatsXml",DATAPATH."Statistics/Stats$thisYear.xml");
27 // if (file_exists(StatsXml)) unlink(StatsXml); 29 // if (file_exists(StatsXml)) unlink(StatsXml);
28 } 30 }
29 else { 31 else {
30 // individual - to write 32 // individual - to write
31 - define("StatsXml", USERPATH."/".$user."/Stats.xml"); 33 + // define("StatsXml", USERPATH."/".$user."/Stats.xml");
  34 + define("StatsXml", USERPATH.$user."/Stats$thisYear.xml");
32 $this->user = $user; 35 $this->user = $user;
33 } 36 }
34 } 37 }
@@ -63,15 +66,18 @@ class AmdaStats { @@ -63,15 +66,18 @@ class AmdaStats {
63 /* 66 /*
64 * Merge individual User Stats.xml into one generique Stats.xml 67 * Merge individual User Stats.xml into one generique Stats.xml
65 */ 68 */
66 - public function mergeXml() {  
67 - 69 + public function mergeXml($year) {
  70 + // long procedure
  71 + ini_set('max_execution_time', 600);
  72 +
68 $tags = array_merge($this->tasks, $this->tasksAdd); 73 $tags = array_merge($this->tasks, $this->tasksAdd);
69 74
70 $doc2 = new DomDocument("1.0"); 75 $doc2 = new DomDocument("1.0");
71 - 76 + if ($year == null) $year = date("Y");
  77 +
72 $users=glob(USERPATH."*"); 78 $users=glob(USERPATH."*");
73 foreach ($users as $user) { 79 foreach ($users as $user) {
74 - $name2 = $user."/Stats.xml"; 80 + $name2 = $user."/Stats$year.xml";
75 81
76 if (!file_Exists($name2)) continue; 82 if (!file_Exists($name2)) continue;
77 83