CDPP / AMDA_IHM

Commit 5454dd64e2a485e97c06c1613a25d7e062dfcfb0

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

Refactoring epntap.php: Add getParam() function

Showing 1 changed file with 23 additions and 16 deletions   Show diff stats
Inline Side-by-side
php/epntap.php
  Diff comments   View file @5454dd6
... ... @@ -24,6 +24,14 @@ switch ($action) {
24 24 }
25 25 echo json_encode($response);
26 26  
  27 +function getParam($paramName, $default=null) {
  28 + if(array_key_exists($paramName, $_GET)) {
  29 + return filter_var($_GET[$paramName], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
  30 + } else {
  31 + return $default;
  32 + }
  33 +}
  34 +
27 35 function resolver() {
28 36 $input = filter_var($_GET['input'], FILTER_SANITIZE_URL);
29 37 $resolver_url = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete?q=%22$input%22";
... ... @@ -111,12 +119,12 @@ function getServices() {
111 119 }
112 120  
113 121 function getNbResults() {
114   - $url = filter_var($_GET['url'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
115   - $tableName = filter_var($_GET['tableName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
116   - $targetName = filter_var($_GET['targetName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
117   - $productTypes = filter_var($_GET['productTypes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
118   - $timeMin = filter_var($_GET['timeMin'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
119   - $timeMax = filter_var($_GET['timeMax'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
  122 + $url = getParam('url');
  123 + $tableName = getParam('tableName');
  124 + $targetName = getParam('targetName');
  125 + $productTypes = getParam('productTypes');
  126 + $timeMin = getParam('timeMin');
  127 + $timeMax = getParam('timeMax');
120 128  
121 129 $query = "SELECT COUNT(*) AS nb_rows FROM $tableName" . createFilter($targetName, $productTypes, $timeMin, $timeMax);
122 130 $response = request($url, $query);
... ... @@ -145,16 +153,15 @@ function getNbResults() {
145 153 }
146 154  
147 155 function getGranules() {
148   - // TODO: simplify this
149   - $url = filter_var($_GET['url'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
150   - $tableName = filter_var($_GET['tableName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
151   - $targetName = filter_var($_GET['targetName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
152   - $productTypes = filter_var($_GET['productTypes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
153   - $timeMin = filter_var($_GET['timeMin'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
154   - $timeMax = filter_var($_GET['timeMax'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
155   - $start = filter_var($_GET['start'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
156   - $limit = filter_var($_GET['limit'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
157   - $nbRes = filter_var($_GET['nbRes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
  156 + $url = getParam('url');
  157 + $tableName = getParam('tableName');
  158 + $targetName = getParam('targetName');
  159 + $productTypes = getParam('productTypes');
  160 + $timeMin = getParam('timeMin');
  161 + $timeMax = getParam('timeMax');
  162 + $start = getParam('start');
  163 + $limit = getParam('limit');
  164 + $nbRes = getParam('nbRes');
158 165  
159 166 $filter = createFilter($targetName, $productTypes, $timeMin, $timeMax);
160 167 $query = "SELECT TOP $limit * FROM $tableName $filter OFFSET $start";
... ...