Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Foxx: Code Style

This commit is contained in:
Lucas Dohmen 2013-03-21 12:36:28 +01:00
parent 52258ebbfa
commit ef8e467420
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/common/modules/org/arangodb/foxx.js
View File

@ -498,27 +498,28 @@ FormatMiddleware = function (allowedFormats, defaultFormat) {
}
if (parsed.format !== mimeToUrlFormat[parsed.contentType]) {
parsed.error = "Contradiction between Accept Header and URL.";
throw "Contradiction between Accept Header and URL.";
}
if (allowedFormats.indexOf(parsed.format) < 0) {
parsed.error = "Format '" + parsed.format + "' is not allowed.";
throw "Format '" + parsed.format + "' is not allowed.";
}
return parsed;
};
middleware = function (request, response, options, next) {
var parsed = determinePathAndFormat(request.path, request.headers);
var parsed;
if (parsed.error === undefined) {
try {
parsed = determinePathAndFormat(request.path, request.headers);
request.path = parsed.path;
request.format = parsed.format;
response.contentType = parsed.contentType;
next();
} else {
} catch (e) {
response.responseCode = 406;
response.body = parsed.error;
response.body = e;
}
};