diff --git a/src/InputOutput/IHMImpl/IHMInputOutputClass.php b/src/InputOutput/IHMImpl/IHMInputOutputClass.php index 00f3584..99fad99 100644 --- a/src/InputOutput/IHMImpl/IHMInputOutputClass.php +++ b/src/InputOutput/IHMImpl/IHMInputOutputClass.php @@ -55,7 +55,7 @@ class IHMInputOutputClass implements InputOutputInterface //set working dir for interactive plot $requestId = "Plot"; break; - case 'statistics' : + case 'statistic' : //catalog generation $this->inputOutput = new IHMInputOutputParamsStatisticsClass(); break; diff --git a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php index 28ba8af..abd6fb0 100644 --- a/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php +++ b/src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php @@ -10,12 +10,12 @@ class IHMJobsManagerClass { protected $bkgRootNode = array('condition' => 'bkgSearch-treeRootNode', 'request' => 'bkgPlot-treeRootNode', 'download' => 'bkgDown-treeRootNode', - 'statistics' => 'bkgStatistics-treeRootNode'); + 'statistic' => 'bkgStatistics-treeRootNode'); protected $resRootNode = array('condition' => 'resSearch-treeRootNode', 'request' => 'resPlot-treeRootNode', 'download' => 'resDown-treeRootNode', - 'statistics' => 'resStatistics-treeRootNode'); + 'statistic' => 'resStatistics-treeRootNode'); /* * @brief Constructor @@ -382,11 +382,11 @@ class IHMJobsManagerClass { $infos['Start date'] = $obj['startDate']; $infos['Stop date'] = $obj['stopDate']; break; - case 'statistics': + case 'statistic': $name = 'statistics_'.time(); - $infos['Name'] = $obj['name']; // TODO: name toujours égal à 'test' (?) - - // TODO : lire data/user/TT/tt_0.xml -> trouver ttname + nbIntervals + if($obj['name'] != '') { + $infos['Name'] = $obj['name']; + } if(array_key_exists('timeTables', $obj)) { $ttXml = new DomDocument(); diff --git a/src/InputOutput/IHMImpl/Tools/IHMUserWSManagerClass.php b/src/InputOutput/IHMImpl/Tools/IHMUserWSManagerClass.php index f5eb7d2..5f89a2c 100644 --- a/src/InputOutput/IHMImpl/Tools/IHMUserWSManagerClass.php +++ b/src/InputOutput/IHMImpl/Tools/IHMUserWSManagerClass.php @@ -7,7 +7,7 @@ */ class IHMUserWSManagerClass { - private static $WS_VERSION = 2; + private static $WS_VERSION = 3; protected $wsInfo = null; @@ -84,6 +84,35 @@ class IHMUserWSManagerClass return file_put_contents(IHMConfigClass::getUserWSInfoFilePath(),$json_data); } + private function updateFromVersion2() { + // Update WS for save statistic requests + + // Load user requests file + $req_mgr_file_path = IHMConfigClass::getUserRequestManagerFilePath(); + if (!file_exists($req_mgr_file_path)) { + return TRUE; + } + + $dom = new DOMDocument(); + if (!$dom->load($req_mgr_file_path)) { + return FALSE; + } + + $statisticNodeTag = 'statisticList'; + $statisticNodes = $dom->documentElement->getElementsByTagName($statisticNodeTag); + // Id statistic root node already exists, nothing to do + if ($statisticNodes->length > 0) { + return TRUE; + } + + // Create statistic root node + $statisticNode = $dom->createElement($statisticNodeTag); + $statisticNode->setAttribute('xml:id', 'statistic-treeRootNode'); + $dom->documentElement->appendChild($statisticNode); + + return $dom->save($req_mgr_file_path); + } + private function updateFromVersion1() { // Update WS for save download requests -- libgit2 0.21.2