Merge branch 'issues/3' into development

Conflicts:
	package.json

libs/app.js

@@ -2,6 +2,8 @@ var express = require('express')
 var path = require('path')
 var cookieParser = require('cookie-parser')
 var bodyParser = require('body-parser')
+var csv = require('csv-express')
+var xml = require('xml')
 var methodOverride = require('method-override')
 var cors = require('cors')
 

libs/routes/api.js

 var express = require('express')
 var router = express.Router()
-
+var xml = require('xml')
 var libs = process.cwd() + '/libs/'
 
 var log = require(libs + 'log')(module)
@@ -15,9 +15,9 @@ router.get('/', function (req, res) {
 })
 
 router.get('/data', function(req, res) {
-    console.log(req.query)
-    console.log(req.query.met)
-    console.log(req.query.dim)
+    log.debug(req.query)
+    log.debug(req.query.met)
+    log.debug(req.query.dim)
     conn.query(
         'SELECT * FROM turmas'
     ).then(function(result) {
@@ -27,8 +27,8 @@ router.get('/data', function(req, res) {
     })
 })
 
-router.get('/matriculas', function(req, res) {
-    console.log(req.query);
+router.get('/matriculas.:format?', function(req, res) {
+    log.debug(req.query);
 
     tbl_name = "matriculas";
     switch(req.query.agregar)
@@ -41,17 +41,27 @@ router.get('/matriculas', function(req, res) {
         break;
     }
 
-    console.log("Querying table '" + tbl_name + "'");
+    log.info("Querying table '" + tbl_name + "'");
 
     /* FIXME: Replace parameter substitution
        - Might not be needed since the parameter tbl_name is not supplied by the user */
     conn.query(
         'SELECT * FROM ' + tbl_name, true
     ).then(function(result) {
-        console.log(result);
-        res.json({
-            result: result.data
-        })
+        log.debug(result);
+        if (req.params.format === 'csv') {
+          res.csv(result.data)
+        } else if (req.params.format === 'xml') {
+          res.set('Content-Type', 'text/xml')
+          res.send(xml({
+            'result': result.data
+          }))
+        }
+        else {
+          res.json({
+              result: result.data
+          })
+        }
     });
 })
 

package.json

@@ -12,13 +12,15 @@
     "body-parser": "^1.13.1",
     "cookie-parser": "^1.3.5",
     "cors": "^2.7.1",
+    "csv-express": "^1.1.0",
     "debug": "~2.0.x",
     "express": "^4.13.0",
     "faker": "^2.1.5",
     "method-override": "^2.3.3",
     "monetdb": "^1.1.2",
     "nconf": "^0.6.x",
-    "winston": "^2.2.0"
+    "winston": "^2.2.0",
+    "xml": "^1.0.1"
   },
   "license": "MIT"
 }