CDPP / AMDA_IHM

Commit e2a002b9943700804b45968eab8dc1cbd33f08b5

Authored by Benjamin Renard
1 parent b4fbe992
Exists in master and in 92 other branches 10098, 10178, 5390, 6629, 6728, 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, frames-transformation, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Save parsed timeRestriction in cache

Showing 1 changed file with 20 additions and 17 deletions   Show diff stats
Inline Side-by-side
php/classes/UserMgr.php
  Diff comments   View file @e2a002b
... ... @@ -161,7 +161,7 @@ class UserMgr
161 161 $restrictionFilePath = datasetsTimeRestrictionJson;
162 162 if (file_exists($restrictionFilePath)) {
163 163 // Re-use the cache file if it's not older than 3600s.
164   - if (abs(time() - filemtime($restrictionFilePath)) > 3600) {
  164 + if (abs(time() - filemtime($restrictionFilePath)) < 3600) {
165 165 $fileContent = file_get_contents($restrictionFilePath);
166 166 if (!empty($fileContent)) {
167 167 $this->datasetsTimeRestriction = json_decode($fileContent, TRUE);
... ... @@ -177,6 +177,25 @@ class UserMgr
177 177 $this->datasetsTimeRestriction = $this->amdaClient->getDatasetsWithTimeRestriction();
178 178  
179 179 if ($this->datasetsTimeRestriction !== FALSE) {
  180 + foreach ($this->datasetsTimeRestriction as &$datasetTimeRestriction) {
  181 + $timeRestriction = $datasetTimeRestriction['restriction'];
  182 + //Parse time restriction
  183 + $n = sscanf($timeRestriction, "%04d-%02d-%02d", $yy, $mm, $dd);
  184 + if ($n != 3) {
  185 + $n = sscanf($timeRestriction, "%d", $ndays);
  186 + if ($n != 1) {
  187 + //Cannot parse the time restriction
  188 + $timeRestriction = '';
  189 + }
  190 + else {
  191 + $timeRestriction = date("Y-m-d", strtotime("-$ndays days"))."T23:59:59.999Z";
  192 + }
  193 + }
  194 + else {
  195 + $timeRestriction .= "T23:59:59.999Z";
  196 + }
  197 + $datasetTimeRestriction['restriction'] = $timeRestriction;
  198 + }
180 199 $content = json_encode($this->datasetsTimeRestriction);
181 200 $this->datasetsTimeRestrictionCheckSum = md5($content);
182 201 file_put_contents($restrictionFilePath, $content);
... ... @@ -715,22 +734,6 @@ class UserMgr
715 734 if ($nodes->length > 0) {
716 735 foreach ($nodes as $node) {
717 736 $timeRestriction = $datasetTimeRestriction['restriction'];
718   - //Parse time restriction
719   - $n = sscanf($timeRestriction, "%04d-%02d-%02d", $yy, $mm, $dd);
720   - if ($n != 3) {
721   - $n = sscanf($timeRestriction, "%d", $ndays);
722   - if ($n != 1) {
723   - //Cannot parse the time restriction
724   - $timeRestriction = '';
725   - }
726   - else {
727   - $timeRestriction = date("Y-m-d", strtotime("-$ndays days"))."T23:59:59.999Z";
728   - }
729   - }
730   - else {
731   - $timeRestriction .= "T23:59:59.999Z";
732   - }
733   -
734 737 if (!empty($timeRestriction)) {
735 738 $node->setAttribute('timeRestriction', $timeRestriction);
736 739 }
... ...