CDPP / AMDA_IHM

Commit fe923a9db7fa4b905098ef5832f0aeb7a44cfc61

Authored by Myriam Bouchemit
2 parents 9b6c46d9 50fc8d16
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

Merge branch 'epntap' into 'master' 

Epntap

bugfix #5846

See merge request !7
Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @fe923a9
... ... @@ -8,6 +8,9 @@ generic_data/Statistics/
8 8 generic_data/newKernelDDBase/
9 9 generic_data/ParamTemplate/
10 10 generic_data/ParamInfo/*.xml
  11 +generic_data/DataSetInfo/
  12 +generic_data/InstrumentInfo/
  13 +generic_data/MissionInfo/
11 14 js/lib/ext
12 15 help/simu
13 16 help/auto
... ...
php/epntap.php
  Diff comments   View file @fe923a9
... ... @@ -166,7 +166,7 @@ function getGranules() {
166 166 $select = "SELECT TOP " . $p['limit'] . " *";
167 167 $from = "FROM " . $p['tableName'];
168 168 $where = createFilter($p['targetNames'], $p['productTypes'], $p['timeMin'], $p['timeMax']);
169   - $order = "ORDER BY " . is_null($p['sort']) ? 'granule_uid ASC' : ($p['sort'] . ' ' . $p['dir']) . " OFFSET " . $p['start'];
  169 + $order = "ORDER BY " . (is_null($p['sort']) ? 'granule_uid ASC' : ($p['sort'] . ' ' . $p['dir']) . " OFFSET " . $p['start']);
170 170 $response = request($p['url'], "$select $from $where $order");
171 171 if($response['success']) {
172 172 $visibleColumns = ['granule_gid', 'obs_id', 'dataproduct_type', 'time_min', 'time_max', 'instrument_name', 'processing_level', 'access_estsize', 'thumbnail_url', 'access_url']; // rest are hidden
... ...