Commit 56224bd3 authored by project's avatar project

--no commit message

--no commit message
parent 9dd23062
...@@ -40,6 +40,17 @@ responseHelper.prototype.setLastModified = function(lm){ ...@@ -40,6 +40,17 @@ responseHelper.prototype.setLastModified = function(lm){
} }
responseHelper.prototype.responseOK = responseResult; responseHelper.prototype.responseOK = responseResult;
responseHelper.prototype.write = function (data)
{
this.response.write(data);
}
responseHelper.prototype.endOK = function ()
{
this.response.status(200).end();
}
responseHelper.prototype.response304 = function(){ responseHelper.prototype.response304 = function(){
this.response.status(304).send('Not Modified'); this.response.status(304).send('Not Modified');
} }
......
...@@ -17,7 +17,8 @@ router.get('/:id',function (req, res) { ...@@ -17,7 +17,8 @@ router.get('/:id',function (req, res) {
var respHelper = response.create(res); var respHelper = response.create(res);
var oid = req.params.id; var oid = req.params.id;
get_object(reqHelper,respHelper,oid); var opt = {}
get_object(reqHelper,respHelper,{'oid':oid,'opt':opt});
}); });
...@@ -27,13 +28,19 @@ router.get('/:id/data',function (req, res) { ...@@ -27,13 +28,19 @@ router.get('/:id/data',function (req, res) {
var query = reqHelper.getQuery(); var query = reqHelper.getQuery();
var oid = req.params.id; var oid = req.params.id;
get_object(reqHelper,respHelper,oid); var opt = {
'field' : 'data'
}
get_object(reqHelper,respHelper,{'oid':oid,'opt':opt});
}); });
function get_object(reqHelper,respHelper,oid,opt) function get_object(reqHelper,respHelper,prm)
{ {
opt=opt||{}; prm=prm||{};
var oid = prm.oid;
var opt = prm.opt || {};
if(!oid){ if(!oid){
return respHelper.response404(); return respHelper.response404();
...@@ -75,7 +82,7 @@ function get_object(reqHelper,respHelper,oid,opt) ...@@ -75,7 +82,7 @@ function get_object(reqHelper,respHelper,oid,opt)
rd.objectAt(seq,function(err,obj){ rd.objectAt(seq,function(err,obj){
bss.close(function(err){ bss.close(function(err){
if(obj && obj_id.toString() == (new ObjId(obj.header.ID)).toString()){ if(obj && obj_id.toString() == (new ObjId(obj.header.ID)).toString()){
respHelper.responseOK(obj_out(obj)); output(respHelper,obj,opt);
}else{respHelper.response404();} }else{respHelper.response404();}
}); });
}); });
...@@ -89,12 +96,19 @@ function get_object(reqHelper,respHelper,oid,opt) ...@@ -89,12 +96,19 @@ function get_object(reqHelper,respHelper,oid,opt)
} }
function obj_out(obj,opt){ function output(resp,obj,opt)
return {"_id" : (new ObjId(obj.header.ID)).toString(), {
obj_out(resp,obj,opt);
}
function obj_out(resp,obj,opt){
var ret = {"_id" : (new ObjId(obj.header.ID)).toString(),
"meta" : obj.meta, "meta" : obj.meta,
"data" : obj.data "data" : obj.data
} }
resp.responseOK(ret);
} }
module.exports = router; module.exports = router;
...@@ -241,8 +241,4 @@ var job_config = { ...@@ -241,8 +241,4 @@ var job_config = {
// console.log(crons.list); // console.log(crons.list);
// }); // });
var wUrl = "http://203.155.220.231/Radar/pics/zfiltered.jpg"; var dat = 'hello';
var request = require('request').defa
request.get(wUrl, function (err, res, body) {
console.log(body);
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment