From ad36f6d857c38e2cc540c8c64ad69031b2778035 Mon Sep 17 00:00:00 2001 From: renansoares Date: Wed, 27 May 2015 10:24:42 -0300 Subject: [PATCH] Adicionado endpoint de retorno da glosa e corrigido bug no endpoint de texto --- server.js | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) mode change 100644 => 100755 server.js diff --git a/server.js b/server.js old mode 100644 new mode 100755 index 7e3b3c4..f40e80d --- a/server.js +++ b/server.js @@ -4,14 +4,17 @@ var properties = require('./helpers/properties'); var ep_texto = require('./endpoints/texto'); var ep_ios = require('./endpoints/ios'); var ep_video = require('./endpoints/video'); -var ep_audio = require('./endpoints/audio'); var ep_legenda = require('./endpoints/legenda'); var ep_video_legenda = require('./endpoints/video_legenda'); +var mongoose = require('mongoose'); +require('./db/config').connect(mongoose); var express = require('express'); var path = require('path'); var util = require('util'); var app = express(); +var Request = require('./db/schemas/request').init(mongoose); +var db = require('./db/api'); app.use(express.static(path.join(__dirname, '/videos'))); app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') })); @@ -24,6 +27,7 @@ app.post('/api', function(req, res) { console.log("\n\n\n============================================="); console.log("[" + new Date().toISOString() + "] Requisição do IP: " + req.ip); console.log("== Parametros: " + util.inspect(req.body)); + console.log("== Body: " + JSON.stringify(req.headers)); /* Verifica se o paramêtro [servico] possui algum valor */ if (req.body.servico !== '') { @@ -31,7 +35,7 @@ app.post('/api', function(req, res) { switch(req.body.servico) { /* Tipo de Serviço: Texto */ case 'texto': - ep_texto.init(req, res); + ep_texto.init(req, res, Request); break; /* Tipo de Serviço: iOS */ @@ -44,11 +48,6 @@ app.post('/api', function(req, res) { ep_video.init(req, res); break; - /* Tipo de Serviço: Só o Áudio */ - case 'audio': - ep_audio.init(req, res); - break; - /* Tipo de Serviço: Só a Legenda */ case 'legenda': ep_legenda.init(req, res); @@ -69,6 +68,25 @@ app.post('/api', function(req, res) { } }); +app.get('/api/requests', function(req, res) { + db.read_all(Request, function(result) { + if (result !== null) { + res.send(200, result); + } else { + res.send(500, { 'error': 'Erro na busca.'}); + } + }); +}); + +app.post('/glosa', function(req, res) { +// options.args = JSON.stringify(req.body); + PythonShell.run('vlibras_user/vlibras-translate/PortGlosa.py', req.body.texto, function (err, results) { + if (err) { console.log(err); res.send(400); return; } + // results is an array consisting of messages collected during execution + res.send(results); + }); +}); + app.listen(properties.port, properties.host, function(){ console.log('Server running on ' + properties.host + ':' + properties.port); }); -- libgit2 0.21.2