Skip to content

Commit

Permalink
- update code for search resource
Browse files Browse the repository at this point in the history
  • Loading branch information
IoTKETI committed May 15, 2018
1 parent 25b4788 commit 26d1528
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions app.js
Expand Up @@ -1807,7 +1807,7 @@ function lookup_create(request, response) {
var rootnm = request.headers.rootnm;

tr.check(request, parent_comm.ri, body_Obj, function (rsc, body_Obj) {
if (rsc === '0') {
if (rsc == '0') {
body_Obj = {};
body_Obj['dbg'] = resultStatusCode['4230'];
responder.response_result(request, response, 423, body_Obj, 4230, request.url, resultStatusCode['4230']);
Expand Down Expand Up @@ -2012,7 +2012,7 @@ function lookup_retrieve(request, response) {
}

tr.check(request, result_Obj.ri, body_Obj, function (rsc, body_Obj) {
if (rsc === '0') {
if (rsc == '0') {
body_Obj = {};
body_Obj['dbg'] = resultStatusCode['4230'];
responder.response_result(request, response, 423, body_Obj, 4230, request.url, resultStatusCode['4230']);
Expand Down Expand Up @@ -2145,7 +2145,7 @@ function lookup_update(request, response) {
}

tr.check(request, results_comm.ri, body_Obj, function (rsc, body_Obj) {
if (rsc === '0') {
if (rsc == '0') {
body_Obj = {};
body_Obj['dbg'] = resultStatusCode['4230'];
responder.response_result(request, response, 423, body_Obj, 4230, request.url, resultStatusCode['4230']);
Expand Down Expand Up @@ -2259,7 +2259,7 @@ function lookup_delete(request, response) {
}

tr.check(request, results_comm.ri, body_Obj, function (rsc, body_Obj) {
if (rsc === '0') {
if (rsc == '0') {
var body_Obj = {};
body_Obj['dbg'] = resultStatusCode['4230'];
responder.response_result(request, response, 423, body_Obj, 4230, request.url, resultStatusCode['4230']);
Expand Down Expand Up @@ -2395,7 +2395,7 @@ app.use(function (req, res, next) {
res.header('Access-Control-Allow-Methods', 'GET, PUT, POST, DELETE, OPTIONS');
res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, X-M2M-RI, X-M2M-RSC, Accept, X-M2M-Origin, Locale');
res.header('Access-Control-Expose-Headers', 'Origin, X-Requested-With, Content-Type, X-M2M-RI, X-M2M-RSC, Accept, X-M2M-Origin, Locale');
(req.method === 'OPTIONS') ? res.sendStatus(200) : next();
(req.method == 'OPTIONS') ? res.sendStatus(200) : next();
});


Expand Down
4 changes: 2 additions & 2 deletions mobius/resource.js
Expand Up @@ -1197,7 +1197,7 @@ function build_resource(request, response, ty, body_Obj, callback) {
if (create_m_attr_list[rootnm].includes(attr)) {
if(attr === 'pvs') {
if(body_Obj[rootnm][attr].hasOwnProperty('acr')) {
if(body_Obj[rootnm][attr].acr.length === 0) {
if(body_Obj[rootnm][attr].acr.length == 0) {
body_Obj = {};
body_Obj['dbg'] = 'BAD REQUEST: ' + attr + '.acr must have values';
responder.response_result(request, response, 400, body_Obj, 4000, request.url, body_Obj['dbg']);
Expand All @@ -1214,7 +1214,7 @@ function build_resource(request, response, ty, body_Obj, callback) {
}
}
else if(attr === 'nu') {
if(body_Obj[rootnm][attr].length === 0) {
if(body_Obj[rootnm][attr].length == 0) {
body_Obj = {};
body_Obj['dbg'] = 'BAD REQUEST: ' + attr + ' must have values';
responder.response_result(request, response, 400, body_Obj, 4000, request.url, body_Obj['dbg']);
Expand Down
2 changes: 1 addition & 1 deletion mobius/sql_action.js
Expand Up @@ -841,7 +841,7 @@ exports.search_parents_lookup = function(ri, pi_list, result_ri, callback) {
pi_list = [];
for(var idx in result_lookup_ri) {
if(result_lookup_ri.hasOwnProperty(idx)) {
if(result_lookup_ri[idx].ty !== '23' && result_lookup_ri[idx].ty !== '4' && result_lookup_ri[idx].ty !== '30' && result_lookup_ri[idx].ty !== '17') {
if(result_lookup_ri[idx].ty != '23' && result_lookup_ri[idx].ty != '4' && result_lookup_ri[idx].ty != '30' && result_lookup_ri[idx].ty != '17') {
pi_list.push(result_lookup_ri[idx].ri);
result_ri.push(result_lookup_ri[idx]);
}
Expand Down
4 changes: 2 additions & 2 deletions mobius/tr.js
Expand Up @@ -395,7 +395,7 @@ exports.check = function(request, pi, body_Obj, callback) {
if (results_tr[i].hasOwnProperty('tltp')) {
if(results_tr[i].tltp == tltp_v.BLOCK_ALL) {
if (results_tr[i].hasOwnProperty('tst')) {
if (results_tr[i].tst !== tst_v.COMMITTED && results_tr[i].tst !== tst_v.ABORTED) {
if (results_tr[i].tst != tst_v.COMMITTED && results_tr[i].tst != tst_v.ABORTED) {
state = results_tr[i].tst;
break;
}
Expand All @@ -408,7 +408,7 @@ exports.check = function(request, pi, body_Obj, callback) {
}
else {
if (results_tr[i].hasOwnProperty('tst')) {
if (results_tr[i].tst !== tst_v.COMMITTED && results_tr[i].tst !== tst_v.ABORTED) {
if (results_tr[i].tst != tst_v.COMMITTED && results_tr[i].tst != tst_v.ABORTED) {
state = results_tr[i].tst;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion pxy_coap.js
Expand Up @@ -248,7 +248,7 @@ function coap_message_handler(request, response) {
}

req.on('error', function (e) {
if (e.message !== 'read ECONNRESET') {
if (e.message != 'read ECONNRESET') {
console.log('[pxycoap - http_retrieve_CSEBase] problem with request: ' + e.message);
}
});
Expand Down

0 comments on commit 26d1528

Please sign in to comment.