lfapi
changeset 40:6d4de6b0d0f6
Updates for Core 2.2
author | bsw |
---|---|
date | Fri Mar 22 07:51:31 2013 +0100 (2013-03-22) |
parents | c691a871a03b |
children | 43c90f066b52 |
files | config.js lfapi/db.js lfapi/fields.js lfapi/general_params.js |
line diff
1.1 --- a/config.js Fri Aug 24 16:55:36 2012 +0200 1.2 +++ b/config.js Fri Mar 22 07:51:31 2013 +0100 1.3 @@ -16,7 +16,7 @@ 1.4 exports.public_access_level = 'full'; 1.5 1.6 // connection string to access the LiquidFeedback Core database 1.7 -exports.connectionString = 'pg://localhost/liquid_feedback2'; 1.8 +exports.connectionString = 'pg://localhost/liquid_feedback'; 1.9 1.10 // public base url (including trailing slash) 1.11 exports.public_url_path = 'http://apitest.liquidfeedback.org:25520/';
2.1 --- a/lfapi/db.js Fri Aug 24 16:55:36 2012 +0200 2.2 +++ b/lfapi/db.js Fri Mar 22 07:51:31 2013 +0100 2.3 @@ -48,7 +48,7 @@ 2.4 query = query_object.assemble(function(i) { return ('$' + (i + 1)); }); 2.5 } 2.6 2.7 - //console.log(' > SQL: ', query.cmd, query.args ? query.args : ''); 2.8 + console.log(' > SQL: ', query.cmd, query.args ? query.args : ''); 2.9 2.10 conn.query(query.cmd, query.args, function(err, result) { 2.11 if (err) {
3.1 --- a/lfapi/fields.js Fri Aug 24 16:55:36 2012 +0200 3.2 +++ b/lfapi/fields.js Fri Mar 22 07:51:31 2013 +0100 3.3 @@ -7,10 +7,10 @@ 3.4 exports.policy = ['id', 'index', 'active', 'name', 'description', 'admission_time', 'discussion_time', 'verification_time', 'voting_time', 'issue_quorum_num', 'issue_quorum_den', 'initiative_quorum_num', 'initiative_quorum_den', 'direct_majority_num', 'direct_majority_den', 'direct_majority_strict', 'direct_majority_positive', 'direct_majority_non_negative', 'indirect_majority_num', 'indirect_majority_den', 'indirect_majority_strict', 'indirect_majority_positive', 'indirect_majority_non_negative', 'no_reverse_beat_path', 'no_multistage_majority']; 3.5 exports.unit = ['id', 'parent_id', 'active', 'name', 'description', 'member_count']; 3.6 exports.area = ['id', 'unit_id', 'active', 'name', 'description', 'direct_member_count', 'member_weight']; 3.7 -exports.issue = ['id', 'area_id', 'policy_id', 'state', 'created', 'accepted', 'half_frozen', 'fully_frozen', 'closed', 'ranks_available', 'cleaned', 'admission_time', 'discussion_time', 'verification_time', 'voting_time', 'snapshot', 'latest_snapshot_event', 'population', 'voter_count', 'status_quo_schulze_rank']; 3.8 -exports.initiative = ['issue_id', 'id', 'name', 'discussion_url', 'created', 'revoked', 'revoked_by_member_id', 'suggested_initiative_id', 'admitted', 'supporter_count', 'informed_supporter_count', 'satisfied_supporter_count', 'satisfied_informed_supporter_count', 'positive_votes', 'negative_votes', 'rank', 'direct_majority', 'indirect_majority', 'schulze_rank', 'better_than_status_quo', 'worse_than_status_quo', 'reverse_beat_path', 'multistage_majority', 'eligible', 'winner']; 3.9 -exports.suggestion = ['initiative_id', 'id', 'created', 'author_id', 'name', 'formatting_engine', 'content', 'minus2_unfulfilled_count', 'minus2_fulfilled_count', 'minus1_unfulfilled_count', 'minus1_fulfilled_count', 'plus1_unfulfilled_count', 'plus1_fulfilled_count', 'plus2_unfulfilled_count', 'plus2_fulfilled_count']; 3.10 -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']; 3.11 +exports.issue = ['id', 'area_id', 'policy_id', 'state', 'created', 'accepted', 'half_frozen', 'fully_frozen', 'closed', 'cleaned', 'admission_time', 'discussion_time', 'verification_time', 'voting_time', 'snapshot', 'latest_snapshot_event', 'population', 'voter_count', 'status_quo_schulze_rank']; 3.12 +exports.initiative = ['issue_id', 'id', 'name', 'discussion_url', 'created', 'revoked', 'revoked_by_member_id', 'suggested_initiative_id', 'admitted', 'supporter_count', 'informed_supporter_count', 'satisfied_supporter_count', 'satisfied_informed_supporter_count', 'harmonic_weight', 'positive_votes', 'negative_votes', 'rank', 'direct_majority', 'indirect_majority', 'schulze_rank', 'better_than_status_quo', 'worse_than_status_quo', 'reverse_beat_path', 'multistage_majority', 'eligible', 'winner']; 3.13 +exports.suggestion = ['initiative_id', 'id', 'created', 'author_id', 'name', 'formatting_engine', 'content', 'minus2_unfulfilled_count', 'minus2_fulfilled_count', 'minus1_unfulfilled_count', 'minus1_fulfilled_count', 'plus1_unfulfilled_count', 'plus1_fulfilled_count', 'plus2_unfulfilled_count', 'plus2_fulfilled_count', 'proportional_order']; 3.14 +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', 'proportional_order']; 3.15 3.16 // add fields of a data structure to where AND group by clause of a query 3.17 exports.addObjectFields = function (query, clazz, field_class) {
4.1 --- a/lfapi/general_params.js Fri Aug 24 16:55:36 2012 +0200 4.2 +++ b/lfapi/general_params.js Fri Mar 22 07:51:31 2013 +0100 4.3 @@ -126,9 +126,6 @@ 4.4 if (params.issue_cleaned === '1') query.addWhere('"issue"."cleaned" NOTNULL'); 4.5 if (params.issue_cleaned === '0') query.addWhere('"issue"."cleaned" ISNULL'); 4.6 4.7 - if (params.issue_ranks_available === '1') query.addWhere('"issue"."ranks_available"'); 4.8 - if (params.issue_ranks_available === '0') query.addWhere('NOT "issue"."ranks_available"'); 4.9 - 4.10 if (params.issue_created_after) query.addWhere(['"issue"."created" >= ?', params.issue_created_after]); 4.11 if (params.issue_created_before) query.addWhere(['"issue"."created" < ?', params.issue_created_before]); 4.12 if (params.issue_accepted_after) query.addWhere(['"issue"."accepted" >= ?', params.issue_accepted_after]);