CDPP / AMDA_IHM

Commit e461c01f60c7791c33849ed5a9e31c6cbaf8e5d4

Authored by Nathanael Jourdane
1 parent 8336fb93
Exists in master and in 112 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, livraison-akka, 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

Improve VOTable parser

Showing 2 changed files with 7 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/EpnTapMgr.php
  Diff comments   View file @e461c01
... ... @@ -19,7 +19,10 @@ class EpnTapMgr {
19 19 }
20 20  
21 21 public function JDTodate($jd) {
22   - list($month, $day, $year) = preg_split('/[\s\/:]+/', JDToGregorian($jd));
  22 + if(!is_numeric($jd)) {
  23 + return '';
  24 + }
  25 + list($month, $day, $year) = preg_split('/[\s\/:]+/', JDToGregorian(intval($jd)));
23 26 $date = sprintf('%02d', $day) . '/' . sprintf('%02d', $month) . '/' . sprintf('%04d', $year);
24 27 return ($date == '00/00/0000') ? '' : $date;
25 28 }
... ... @@ -40,7 +43,7 @@ class EpnTapMgr {
40 43 public function request($access_url, $query) {
41 44 $votMgr = new VOTableMgr;
42 45 $params = 'FORMAT=votable&LANG=ADQL&REQUEST=doQuery';
43   - $url = $access_url . '/sync?' . $params . '&QUERY=' . urlencode($query);
  46 + $url = $access_url . '/sync?' . $params . '&QUERY=' . urlencode(preg_replace('/\s+/', ' ', $query)); // remove also multiple whitespaces
44 47  
45 48 $res = $votMgr->load($url);
46 49 $this->addLog("Query URL: " . $url);
... ...
php/classes/VOTableMgr.php
  Diff comments   View file @e461c01
... ... @@ -359,8 +359,9 @@ class VOTableMgr {
359 359 $res = $b == "T" || $b == "t" || $b == "1";
360 360 break;
361 361 case 'char':
  362 + $res = $row_size!=0 ? utf8_encode($substr) : NULL;
362 363 case 'unicodeChar':
363   - $res = $row_size!=0 ? $substr : NULL;
  364 + $res = $row_size!=0 ? utf8_encode(str_replace("\0", "", $substr)) : NULL;
364 365 break;
365 366 case 'short':
366 367 $res = unpack("ss", $substr)["s"];
... ...