CDPP / AMDA_IHM

Commit e2d7887b067ae1e78d8ea39c733ea3f36ae7089c

Authored by Benjamin Renard
1 parent 63057027
Exists in master and in 88 other branches 10098, 10178, 5390, 6629, 6728, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Fix apiDoc install

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @e2d7887
1 1 data/
2 2 shared_data/
  3 +help/apidoc/
3 4 generic_data/EPNResources/*.xml
4 5 generic_data/LocalData/
5 6 generic_data/RemoteData/
... ... @@ -20,3 +21,4 @@ _test*
20 21 *.idea
21 22 /nbproject/
22 23 nohup.out
  24 +php/rest/apidoc.json
... ...
php/rest/apidoc.json renamed to php/rest/apidoc.json.template
  Diff comments   View file @e2d7887
... ... @@ -2,6 +2,6 @@
2 2 "name": "AMDA web-services Rest API",
3 3 "description": "The web-services provided by AMDA aim at giving to a user access public data as well as its private data. These data may be private or shared Time Tables, public or user-defined parameters. All these webservices are also available through a SOAP interface.",
4 4 "title": "AMDA Web-services Rest API documentation",
5   - "url": "http://amda.irap.omp.eu/php/rest/",
6   - "sampleUrl": "http://amda.irap.omp.eu/php/rest/"
  5 + "url": "{:REST_API_URL:}",
  6 + "sampleUrl": "{:REST_API_URL:}"
7 7 }
... ...
scripts/apiDoc.php
  Diff comments   View file @e2d7887
... ... @@ -2,11 +2,11 @@
2 2 require_once dirname(__FILE__) . '/../php/config.php';
3 3  
4 4 $restFolderPath = AMDA_IHM . "php/rest";
5   -$apidocConfigFile = $restFolderPath . "apidoc.json";
6   -$tempConfigFile = tempnam(sys_get_temp_dir(), 'apidoc.json');
  5 +$apidocConfigTemplateFile = $restFolderPath . "/apidoc.json.template";
  6 +$apidocConfigFile = $restFolderPath . "/apidoc.json";
7 7  
8   -$apidocConfig = str_replace("{:REST_API_URL:}", REST_API_URL, file_get_contents($apidocConfigFile));
9   -file_put_contents($tempConfigFile, $apidocConfig);
  8 +$apidocConfig = str_replace("{:REST_API_URL:}", REST_API_URL, file_get_contents($apidocConfigTemplateFile));
  9 +file_put_contents($apidocConfigFile, $apidocConfig);
10 10  
11   -echo exec("apidoc -v -c $tempConfigFile -i $restFolderPath -o " . API_DOC_PATH);
  11 +echo exec("apidoc -v -c $apidocConfigFile -i $restFolderPath -o " . API_DOC_PATH).PHP_EOL;
12 12 ?>
... ...