# HG changeset patch
# User bsw
# Date 1363935091 -3600
# Node ID 6d4de6b0d0f65e1a8d5b4e6165b51eb5330cae36
# Parent  c691a871a03bd7df36ea11d11d09cdf157c81e95
Updates for Core 2.2

diff -r c691a871a03b -r 6d4de6b0d0f6 config.js
--- a/config.js	Fri Aug 24 16:55:36 2012 +0200
+++ b/config.js	Fri Mar 22 07:51:31 2013 +0100
@@ -16,7 +16,7 @@
 exports.public_access_level = 'full';
 
 // connection string to access the LiquidFeedback Core database
-exports.connectionString = 'pg://localhost/liquid_feedback2';
+exports.connectionString = 'pg://localhost/liquid_feedback';
 
 // public base url (including trailing slash)
 exports.public_url_path = 'http://apitest.liquidfeedback.org:25520/';
diff -r c691a871a03b -r 6d4de6b0d0f6 lfapi/db.js
--- a/lfapi/db.js	Fri Aug 24 16:55:36 2012 +0200
+++ b/lfapi/db.js	Fri Mar 22 07:51:31 2013 +0100
@@ -48,7 +48,7 @@
       query = query_object.assemble(function(i) { return ('$' + (i + 1)); });
     }
     
-    //console.log('  > SQL: ', query.cmd, query.args ? query.args : '');
+    console.log('  > SQL: ', query.cmd, query.args ? query.args : '');
     
     conn.query(query.cmd, query.args, function(err, result) {
       if (err) {
diff -r c691a871a03b -r 6d4de6b0d0f6 lfapi/fields.js
--- a/lfapi/fields.js	Fri Aug 24 16:55:36 2012 +0200
+++ b/lfapi/fields.js	Fri Mar 22 07:51:31 2013 +0100
@@ -7,10 +7,10 @@
 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'];
 exports.unit = ['id', 'parent_id', 'active', 'name', 'description', 'member_count'];
 exports.area = ['id', 'unit_id', 'active', 'name', 'description', 'direct_member_count', 'member_weight'];
-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'];
-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'];
-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'];
-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'];
+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'];
+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'];
+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'];
+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'];
 
 // add fields of a data structure to where AND group by clause of a query
 exports.addObjectFields = function (query, clazz, field_class) {
diff -r c691a871a03b -r 6d4de6b0d0f6 lfapi/general_params.js
--- a/lfapi/general_params.js	Fri Aug 24 16:55:36 2012 +0200
+++ b/lfapi/general_params.js	Fri Mar 22 07:51:31 2013 +0100
@@ -126,9 +126,6 @@
   if (params.issue_cleaned === '1') query.addWhere('"issue"."cleaned" NOTNULL');
   if (params.issue_cleaned === '0') query.addWhere('"issue"."cleaned" ISNULL');
 
-  if (params.issue_ranks_available === '1') query.addWhere('"issue"."ranks_available"');
-  if (params.issue_ranks_available === '0') query.addWhere('NOT "issue"."ranks_available"');
-
   if (params.issue_created_after) query.addWhere(['"issue"."created" >= ?', params.issue_created_after]);
   if (params.issue_created_before) query.addWhere(['"issue"."created" < ?', params.issue_created_before]);
   if (params.issue_accepted_after) query.addWhere(['"issue"."accepted" >= ?', params.issue_accepted_after]);