CDPP / AMDA_IHM

Commit dca1b251549658caf9190cbd03c3359cadf9543d

Authored by Elena.Budnik
1 parent b2e93d92
Exists in master and in 111 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, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, 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

non standard time formats for TT upload

Showing 1 changed file with 15 additions and 12 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableMgr.php
  Diff comments   View file @dca1b25
... ... @@ -162,25 +162,28 @@ class TimeTableMgr extends AmdaObjectMgr
162 162 $description="Uploaded Time Table".PHP_EOL;
163 163  
164 164 foreach ($lines as $line){
165   - if ($line[0] == '#') $description=$description."\n".substr($line,1,-1);
  165 + if ($line[0] == '#') $description=$description.PHP_EOL.substr($line,1,-1);
166 166 else {
167 167 $date = explode(' ',$line);
168 168 if (!strtotime(trim($date[0]))) {
169   - $description=$description."\n".$line;
  169 + $description=$description.PHP_EOL.$line;
170 170 continue;
171 171 }
172 172 // check if it is ISO format
173 173 if (!isset($isIso)) $isIso = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/', trim($date[0]));
174 174 if (!$isIso) {
175   - $tempT = strtotime(trim($date[0]));
176   - $startDate = date('Y-m-d',$tempT)."T".date('H:i:s',$tempT);
177   - $tempT = strtotime(trim($date[1]));
178   - $stopDate = date('Y-m-d',$tempT)."T".date('H:i:s',$tempT);
179   - //TODO convert time into non standard formats
180   - // $startDate = DateTime::createFromFormat($timeFormat, trim($date[0]);
181   - // $start = $startDate->format('Y-m-d')."T".$startDate->format('H:i:s');
182   - // $stopDate = DateTime::createFromFormat($timeFormat, trim($date[1]);
183   - // $stop = $stopDate->format('Y-m-d')."T".$stopDate->format('H:i:s');
  175 + if (count($date) == 2) {
  176 + $tempStartT = strtotime(trim($date[0]));
  177 + $tempStopT = strtotime(trim($date[1]));
  178 + }
  179 + else { // y-m-d h:m:s for example
  180 + $tempStartT = strtotime($date[0]." ".$date[1]);
  181 + $tempStopT = strtotime($date[2]." ".$date[3]);
  182 + }
  183 +
  184 + $startDate = date('Y-m-d\TH:i:s',$tempStartT);
  185 + $stopDate = date('Y-m-d\TH:i:s',$tempStopT);
  186 +
184 187 if (!$onlyDescription)
185 188 $attributesToReturn['intervals'][] = array('start' => $startDate, 'stop' => $stopDate);
186 189 }
... ... @@ -193,7 +196,7 @@ class TimeTableMgr extends AmdaObjectMgr
193 196  
194 197 $attributesToReturn['description'] = $description;
195 198 $attributesToReturn['name'] = basename($tmp_file, '.'.$suffix[1]);
196   - $attributesToReturn['created'] = date('Y-m-d')."T".date('H:i:s');
  199 + $attributesToReturn['created'] = date('Y-m-d\TH:i:s');
197 200  
198 201 return $attributesToReturn;
199 202 }
... ...