CDPP / AMDA_IHM

Commit 9b2dbf25a079fe2ac0b0051d5d1ae33b101659a2

Authored by Nathanael Jourdane
1 parent 1fecb221
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

Add limits to the getGranules query

Showing 2 changed files with 9 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/EpnTapModule.js
  Diff comments   View file @9b2dbf2
@@ -350,7 +350,9 @@ Ext.define('amdaDesktop.EpnTapModule', { @@ -350,7 +350,9 @@ Ext.define('amdaDesktop.EpnTapModule', {
350 'targetName': targetName, 350 'targetName': targetName,
351 'productTypes': productTypes, 351 'productTypes': productTypes,
352 'timeMin': timeMin, 352 'timeMin': timeMin,
353 - 'timeMax': timeMax 353 + 'timeMax': timeMax,
  354 + 'top': this.rowsPerPageNf.value,
  355 + 'offset': 0
354 }, 356 },
355 success: this.updateGranules, 357 success: this.updateGranules,
356 failure: this.updateGranulesFail, 358 failure: this.updateGranulesFail,
@@ -370,8 +372,7 @@ Ext.define('amdaDesktop.EpnTapModule', { @@ -370,8 +372,7 @@ Ext.define('amdaDesktop.EpnTapModule', {
370 }, 372 },
371 373
372 /** 374 /**
373 - Trigerred when a row is clicked in `granulesGrid` table (see `EpnTapUI.createGranulesGrid()`). Do nothing yet, used  
374 - for debug purposes only. 375 + Trigerred when a row is clicked in `granulesGrid` table (see `EpnTapUI.createGranulesGrid()`).
375 */ 376 */
376 updateGranulesFail: function(granule) { 377 updateGranulesFail: function(granule) {
377 var reason = response.status === 200 ? response.responseText : response.statusText; 378 var reason = response.status === 200 ? response.responseText : response.statusText;
php/epntap.php
  Diff comments   View file @9b2dbf2
@@ -98,10 +98,13 @@ function getGranules() { @@ -98,10 +98,13 @@ function getGranules() {
98 $productTypes = filter_var($_GET['productTypes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW); 98 $productTypes = filter_var($_GET['productTypes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
99 $timeMin = filter_var($_GET['timeMin'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW); 99 $timeMin = filter_var($_GET['timeMin'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
100 $timeMax = filter_var($_GET['timeMax'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW); 100 $timeMax = filter_var($_GET['timeMax'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
  101 + $top = filter_var($_GET['top'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
  102 + $offset = filter_var($_GET['offset'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
101 103
102 - // TODO: make this more beatiful  
103 // TODO find a way to handle 'non existing key errors' (and then add access_format) 104 // TODO find a way to handle 'non existing key errors' (and then add access_format)
104 - $query = "SELECT dataproduct_type, target_name, time_min, time_max, granule_uid, access_estsize, access_url, thumbnail_url FROM $tableName" . createFilter($targetName, $productTypes, $timeMin, $timeMax); 105 + $columns = "dataproduct_type, target_name, time_min, time_max, granule_uid, access_estsize, access_url, thumbnail_url";
  106 + $filter = createFilter($targetName, $productTypes, $timeMin, $timeMax);
  107 + $query = "SELECT TOP $top $columns FROM $tableName $filter OFFSET $offset";
105 $result = request($url, $query); 108 $result = request($url, $query);
106 return $result; 109 return $result;
107 } 110 }