From be67b1227e1d2d6817e77ec7776bf44284e99b8b Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 23 Oct 2018 11:34:27 +0200
Subject: [PATCH] stats.xml par yesr
---
php/classes/AmdaStats.php | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/php/classes/AmdaStats.php b/php/classes/AmdaStats.php
index 4a17d72..3eda0e3 100644
--- a/php/classes/AmdaStats.php
+++ b/php/classes/AmdaStats.php
@@ -21,14 +21,17 @@ class AmdaStats {
$this->statXml->formatOutput = true;
if (!defined("StatsXml")){
+ $thisYear = date("Y");
if (!$user){
// general - to read
- define('StatsXml',DATAPATH.'Statistics/Stats.xml');
+ // define('StatsXml',DATAPATH.'Statistics/Stats.xml');
+ define("StatsXml",DATAPATH."Statistics/Stats$thisYear.xml");
// if (file_exists(StatsXml)) unlink(StatsXml);
}
else {
// individual - to write
- define("StatsXml", USERPATH."/".$user."/Stats.xml");
+ // define("StatsXml", USERPATH."/".$user."/Stats.xml");
+ define("StatsXml", USERPATH.$user."/Stats$thisYear.xml");
$this->user = $user;
}
}
@@ -63,15 +66,18 @@ class AmdaStats {
/*
* Merge individual User Stats.xml into one generique Stats.xml
*/
- public function mergeXml() {
-
+ public function mergeXml($year) {
+ // long procedure
+ ini_set('max_execution_time', 600);
+
$tags = array_merge($this->tasks, $this->tasksAdd);
$doc2 = new DomDocument("1.0");
-
+ if ($year == null) $year = date("Y");
+
$users=glob(USERPATH."*");
foreach ($users as $user) {
- $name2 = $user."/Stats.xml";
+ $name2 = $user."/Stats$year.xml";
if (!file_Exists($name2)) continue;
--
libgit2 0.21.2