cvs: pearweb /include/pepr pepr.php

toby Wed Jan 21 17:05:40 2004 EDT Modified files: /pearweb/include/pepr pepr.php Log: * Get sum of conditional votes. http://cvs.php.net/diff.php/pearweb/include/pepr/pepr.php?r1=1.19&r2=1.20&ty=u Index: pearweb/include/pepr/pepr.php diff -u pearweb/include/pepr/pepr.php:1.19 pearweb/include/pepr/pepr.php:1.20 --- pearweb/include/pepr/pepr.php:1.19 Wed Jan 21 11:10:40 2004 +++ pearweb/include/pepr/pepr.php Wed Jan 21 17:05:40 2004 @@ -529,8 +529,12 @@ function getSum ( $dbh, $proposalId ) { $sql = "SELECT SUM(value) FROM package_proposal_votes WHERE pkg_prop_id = ".$proposalId." GROUP BY pkg_prop_id"; - $res = $dbh->getOne($sql); - return (!empty($res)) ? $res: " 0"; + $result = $dbh->getOne($sql); + $res['all'] = (is_numeric($result)) ? $result : 0; + $sql = "SELECT SUM(value) FROM package_proposal_votes WHERE pkg_prop_id = ".$proposalId." AND is_conditional = 1 GROUP BY pkg_prop_id"; + $result = $dbh->getOne($sql); + $res['conditional'] = (is_numeric($result)) ? $result : 0; + return $res; } function getCount ( $dbh, $proposalId ) {