CDPP / AMDA_IHM

Commit e454a2ac1fa00ec4357d676a67e8a8e5e6f11f3c

Authored by Elena.Budnik
2 parents 9d1a1286 fd95c73b
Exists in master and in 108 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 8 changed files with 10 additions and 14 deletions   Show diff stats
Inline Side-by-side
php/rest/getDataset.php
  Diff comments   View file @e454a2a
... ... @@ -17,17 +17,15 @@
17 17 * @apiParam {String} [timeFormat] Format of time in the data files. Two options: `ISO8601` and `UNIXTIME`.
18 18 * @apiParam {String} [gzip] `1` if the file must be compressed before delivery.
19 19 *
20   - * @apiParamExample
21   -
22 20 * @apiSuccess {String} success `true`
23 21 * @apiSuccess {String} dataFileURLs URL of the files matching the criteria. If the file is empty, there is no data
24 22 * matching these criteria.
25 23 *
26   - * @apiSuccessExample
  24 + * @apiSuccessExample Success-Response:
27 25 * HTTP/1.1 200 OK
28 26 * http://amda.irap.omp.eu/AMDA/data/WSRESULT/getdataset_ace-imf-all_20130923T090000_20130924T130000.txt
29 27 *
30   - * @apiErrorExample
  28 + * @apiErrorExample Error-Response:
31 29 * {"error":"Cannot find info file for dataset ace-imf-any"}
32 30  
33 31 */
... ...
php/rest/getObsDataTree.php
  Diff comments   View file @e454a2a
... ... @@ -14,7 +14,7 @@
14 14 * HTTP/1.1 200 OK
15 15 * http://amda.irap.omp.eu/AMDA/data/WSRESULT/obsdatatree_impex_20180727_AmdaLocalDataBaseParameters.xml
16 16 *
17   - * @apiErrorExample
  17 + * @apiErrorExample Error-Response:
18 18 * {"error":"No Amda Local DataBase Parameters description file"}
19 19 */
20 20  
... ...
php/rest/getOrbites.php
  Diff comments   View file @e454a2a
... ... @@ -37,7 +37,7 @@
37 37 * HTTP/1.1 200 OK
38 38 * http://amda.irap.omp.eu/AMDA//data/WSRESULT/getorbites_ace_xyz_gse_km_20130923T090000_20130924T130000.txt
39 39 *
40   - * @apiErrorExample
  40 + * @apiErrorExample Error-Response:
41 41 * {"error":"Cannot find orbit data for ACE1 for 2013-09-23T09:00-2013-09-24T13:00 in km GSE( - )"}
42 42 */
43 43  
... ...
php/rest/getParameter.php
  Diff comments   View file @e454a2a
... ... @@ -19,17 +19,15 @@
19 19 * @apiParam {String} [timeFormat] Format of time in the data files. Two options: `ISO8601` and `UNIXTIME`.
20 20 * @apiParam {String} [gzip] `1` if the file must be compressed before delivery.
21 21 *
22   - * @apiParamExample
23   -
24 22 * @apiSuccess {String} success `true`
25 23 * @apiSuccess {String} dataFileURLs URL of the files matching the criteria. If the file is empty, there is no data
26 24 * matching these criteria.
27 25 *
28   - * @apiSuccessExample
  26 + * @apiSuccessExample Success-Response:
29 27 * HTTP/1.1 200 OK
30 28 * http://amda.irap.omp.eu/AMDA/data/WSRESULT/getparameter_c1_hia_dens_20130923T090000_20130924T130000.txt
31 29 *
32   - * @apiErrorExample
  30 + * @apiErrorExample Error-Response:
33 31 * {"error":"Exception detected : Cannot find parameter local file c1_hia_dens1"}
34 32  
35 33 */
... ...
php/rest/getParameterList.php
  Diff comments   View file @e454a2a
... ... @@ -17,7 +17,7 @@
17 17 * HTTP/1.1 200 OK
18 18 * http://amda.irap.omp.eu/AMDA//data/WSRESULT/parameterlist_impex_20180912_AmdaLocalDataBaseParameters.xml
19 19 *
20   - * @apiErrorExample
  20 + * @apiErrorExample Error-Response:
21 21 * {"error":"Login procedure failed for impex1 : Check your password"}
22 22 */
23 23  
... ...
php/rest/getStatus.php
  Diff comments   View file @e454a2a
... ... @@ -18,7 +18,7 @@
18 18 * {"success":true,"status":"in progress"}
19 19 * {"success":true,"status":"done","dataFileURLs":"http://amda.irap.omp.eu/AMDA/data/WSRESULT/getparameter_c1_hia_dens_20010923T090000_20130924T130000.txt"}
20 20 *
21   - * @apiErrorExample
  21 + * @apiErrorExample Error-Response:
22 22 * {"success":false,"message":"You must provide a job id"}
23 23 */
24 24  
... ...
php/rest/getTimeTable.php
  Diff comments   View file @e454a2a
... ... @@ -17,7 +17,7 @@
17 17 * HTTP/1.1 200 OK
18 18 * http://amda.irap.omp.eu/AMDA/data/WSRESULT/timetable_impex_20180912_sharedtimeTable_0.xml
19 19 *
20   - * @apiErrorExample
  20 + * @apiErrorExample Error-Response:
21 21 * {"error":"No such table sharedtimeTable_100 for user impex"}
22 22 */
23 23  
... ...
php/rest/getTimeTablesList.php
  Diff comments   View file @e454a2a
... ... @@ -18,7 +18,7 @@
18 18 * HTTP/1.1 200 OK
19 19 * http://amda.irap.omp.eu/data/WSRESULT/timetables_impex_20180905.xml
20 20 *
21   - * @apiErrorExample
  21 + * @apiErrorExample Error-Response:
22 22 * {"error": "Workspace Error : Cannot load TimeTable list for userID"}
23 23 */
24 24  
... ...