admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API2: voortaan ook api2/buildings ondersteunen zonder .json/.xml aanduiding. Dan autodetext op httt-accept header

Browse Source 
svn path=/Website/trunk/; revision=33294
This commit is contained in:
Jos Groot Lipman
2017-03-28 21:17:14 +00:00
parent 5e64085f6f
commit 4d81de0443
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/API2/model_swagger.inc
View File

@@ -72,22 +72,25 @@ model_apis =
result.tags = [];
var donetags = {};
var nn = 0;
for (var dispatch in api2_mapper)
{
if (api2_mapper[dispatch].hidden)
continue;
//if (nn++ > 10)
// break;
var filepath = api2_mapper[dispatch].filename;
var filename = filepath.split('/').pop();
var module = api2_mapper[dispatch].module || filename.substr(0, 3).toUpperCase();
if (!api2_mapper[dispatch].nodoc)
{
var trans = "&module={1}&fac_lang={2}".format(dispatch, module, getQParamSafe("fac_lang", user_lang));
result.paths["/" + dispatch + ".json"] =
result.paths["/" + dispatch] =
{
"$ref": HTTP.urlzelf() + "/api2/{0}.api?swagger=1".format(dispatch) + trans
}
result.paths["/" + dispatch + "/{id}.json"] =
result.paths["/" + dispatch + "/{id}"] =
{
"$ref": HTTP.urlzelf() + "/api2/{0}.api?swagger=1&single=1".format(dispatch) + trans
}

10
APPL/FAC/fac_rewrite.config
View File

@@ -24,11 +24,19 @@
<match url="^api2/([a-z0-9_]+)/(\d+)\.(xml|json|html|api|doc|table)/?" />
<action type="Rewrite" url="default.asp?api2={R:1}&amp;format={R:3}&amp;id={R:2}" appendQueryString="true" />
</rule>
<!-- /api2/buildings.xml?... /default.asp?api2=buildings&format=xml&... -->
<rule name="api2SingleRecordAuto" stopProcessing="true">
<match url="^api2/([a-z0-9_]+)/(\d+)/?" />
<action type="Rewrite" url="default.asp?api2={R:1}&amp;format=auto&amp;id={R:2}" appendQueryString="true" />
</rule>
<!-- /api2/buildings.xml?... /default.asp?api2=buildings&format=xml&... -->
<rule name="api2List" stopProcessing="true">
<match url="^api2/([a-z0-9_]+)\.(xml|json|html|api|doc|table)/?" />
<action type="Rewrite" url="default.asp?api2={R:1}&amp;format={R:2}" appendQueryString="true" />
</rule>
<rule name="api2ListAuto" stopProcessing="true">
<match url="^api2/([a-z0-9_]+)/?" />
<action type="Rewrite" url="default.asp?api2={R:1}&amp;format=auto" appendQueryString="true" />
</rule>
<!-- 2015.1 experimenteel: -->
<rule name="unsupportedMelding" stopProcessing="true">
<match url="^melding/(\d+)" />