lfapi
changeset 32:be8ca05d0315
Replaced reserved token class by clazz
author | bsw |
---|---|
date | Sat Feb 25 21:56:55 2012 +0100 (2012-02-25) |
parents | 16fc71c6ab8c |
children | 25aba6a34c44 |
files | lfapi/fields.js lfapi/main.js |
line diff
1.1 --- a/lfapi/fields.js Sun Nov 06 21:18:58 2011 +0100 1.2 +++ b/lfapi/fields.js Sat Feb 25 21:56:55 2012 +0100 1.3 @@ -13,10 +13,10 @@ 1.4 exports.suggestion_pseudonym = ['initiative_id', 'id', 'created', 'name', 'description', 'minus2_unfulfilled_count', 'minus2_fulfilled_count', 'minus1_unfulfilled_count', 'minus1_fulfilled_count', 'plus1_unfulfilled_count', 'plus1_fulfilled_count', 'plus2_unfulfilled_count', 'plus2_fulfilled_count']; 1.5 1.6 // add fields of a data structure to where AND group by clause of a query 1.7 -exports.addObjectFields = function (query, class, field_class) { 1.8 - if (!field_class) { field_class = class }; 1.9 +exports.addObjectFields = function (query, clazz, field_class) { 1.10 + if (!field_class) { field_class = clazz }; 1.11 exports[field_class].forEach(function(field) { 1.12 - query.addField('"' + class + '"."' + field + '"', null, ['grouped']); 1.13 - //query.addGroupBy('"' + class + '"."' + '"' + field + '"'); 1.14 + query.addField('"' + clazz + '"."' + field + '"', null, ['grouped']); 1.15 + //query.addGroupBy('"' + clazz + '"."' + '"' + field + '"'); 1.16 }); 1.17 -}; 1.18 \ No newline at end of file 1.19 +};
2.1 --- a/lfapi/main.js Sun Nov 06 21:18:58 2011 +0100 2.2 +++ b/lfapi/main.js Sat Feb 25 21:56:55 2012 +0100 2.3 @@ -128,7 +128,7 @@ 2.4 function addRelatedData(conn, req, res, result, includes) { 2.5 if (includes.length > 0) { 2.6 var include = includes.shift(); 2.7 - var class = include.class; 2.8 + var clazz = include.clazz; 2.9 var objects = result[include.objects]; 2.10 2.11 var query; 2.12 @@ -140,8 +140,8 @@ 2.13 if (objects.length > 0) { 2.14 objects_exists = true; 2.15 objects.forEach( function(object) { 2.16 - if (object[class + "_id"]) { 2.17 - ids_hash[object[class + "_id"]] = true; 2.18 + if (object[clazz + "_id"]) { 2.19 + ids_hash[object[clazz + "_id"]] = true; 2.20 }; 2.21 }); 2.22 } 2.23 @@ -149,8 +149,8 @@ 2.24 for (var key in objects) { 2.25 objects_exists = true; 2.26 var object = objects[key]; 2.27 - if (object[class + "_id"]) { 2.28 - ids_hash[object[class + "_id"]] = true; 2.29 + if (object[clazz + "_id"]) { 2.30 + ids_hash[object[clazz + "_id"]] = true; 2.31 }; 2.32 }; 2.33 }; 2.34 @@ -162,9 +162,9 @@ 2.35 } 2.36 if (ids.length > 0) { 2.37 query = new selector.Selector(); 2.38 - query.from(class); 2.39 - query.addWhere([class + '.id IN (??)', ids]); 2.40 - fields.addObjectFields(query, class); 2.41 + query.from(clazz); 2.42 + query.addWhere([clazz + '.id IN (??)', ids]); 2.43 + fields.addObjectFields(query, clazz); 2.44 } 2.45 }; 2.46 }; 2.47 @@ -178,10 +178,10 @@ 2.48 }); 2.49 }; 2.50 2.51 - if (class == 'policy') { 2.52 + if (clazz == 'policy') { 2.53 result['policies'] = tmp; 2.54 } else { 2.55 - result[class + 's'] = tmp; 2.56 + result[clazz + 's'] = tmp; 2.57 } 2.58 addRelatedData(conn, req, res, result, includes); 2.59 }); 2.60 @@ -820,6 +820,7 @@ 2.61 db.query(conn, req, res, query, function (initiator, conn) { 2.62 var result = { result: initiator.rows } 2.63 includes = []; 2.64 + if (params.include_members) includes.push({ class: 'member', objects: 'result'}); 2.65 if (params.include_initiatives) includes.push({ class: 'initiative', objects: 'result'}); 2.66 if (params.include_issues) includes.push({ class: 'issue', objects: 'initiatives'}); 2.67 if (params.include_areas) includes.push({ class: 'area', objects: 'issues'});