diff --git a/lib/server/rest.js b/lib/server/rest.js index a0af8729..1ee78e7c 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -24,7 +24,7 @@ onFSGet = main.srvrequire('rest/fs/get').onGet, onFSPut = main.srvrequire('rest/fs/put').onPut, onDelete = main.srvrequire('rest/fs/delete').onDelete, - markdown = main.srvrequire('rest/markdown/put'), + markdown = main.srvrequire('rest/markdown'), JSONDIR = main.JSONDIR, OK = 200, @@ -105,10 +105,11 @@ if (isFS) onFS(pParams); else if (isMD) - pipe.getBody(p.request, function(data) { - markdown.parse(data, function(data) { + markdown.operate(p.request, function(error, data) { + if (error) + sendError(p, error); + else sendResponse(p, data, NOT_LOG); - }); }); else { if (p.name[0] === '/') diff --git a/lib/server/rest/markdown.js b/lib/server/rest/markdown.js new file mode 100644 index 00000000..51150e6a --- /dev/null +++ b/lib/server/rest/markdown.js @@ -0,0 +1,28 @@ +(function(){ + 'use strict'; + + var main = global.cloudcmd.main, + DIR = main.DIR, + MD_DIR = 'rest/markdown/', + pipe = main.pipe, + parse = main.srvrequire(MD_DIR + 'put').parse, + Util = main.util; + + exports.operate = operate; + + function operate(request, callback) { + var method = request.method; + + + switch(method) { + case 'GET': + break; + + case 'PUT': + pipe.getBody(request, function(data) { + parse(data, callback); + }); + break; + } + } +})(); diff --git a/lib/server/rest/markdown/put.js b/lib/server/rest/markdown/put.js index e2b76f6d..4dcdfbff 100644 --- a/lib/server/rest/markdown/put.js +++ b/lib/server/rest/markdown/put.js @@ -16,7 +16,7 @@ else md = '
' + data + ''; - Util.exec(callback, md); + Util.exec(callback, null, md); }); } })();