| Index: trunk/extensions/MetricsReporting/ApiAnalyticsBase.php |
| — | — | @@ -102,7 +102,7 @@ |
| 103 | 103 | break; |
| 104 | 104 | case 'selectprojects': |
| 105 | 105 | // c |
| 106 | | - $query['conds']['project_code'] = $parsedFilter; |
| | 106 | + $query['conds']['comscore_regions.project_code'] = $parsedFilter; |
| 107 | 107 | break; |
| 108 | 108 | case 'selectwikis': |
| 109 | 109 | // c |
| — | — | @@ -136,8 +136,8 @@ |
| 137 | 137 | $data = array(); |
| 138 | 138 | |
| 139 | 139 | $fields = array_map( array( $this, 'getColumnName' ), $query['fields'] ); |
| 140 | | - $metricFields = $this->getMetricFields(); |
| 141 | | - $metricTotals = array(); |
| | 140 | + //$metricFields = $this->getMetricFields(); |
| | 141 | + //$metricTotals = array(); |
| 142 | 142 | |
| 143 | 143 | foreach( $res as $row ) { |
| 144 | 144 | // Dump all data to output |
| — | — | @@ -148,12 +148,12 @@ |
| 149 | 149 | $data[] = $item; |
| 150 | 150 | |
| 151 | 151 | // Do some maths |
| 152 | | - foreach( $metricFields as $field ) { |
| 153 | | - if ( !isset( $metricTotals[$field] ) ) { |
| 154 | | - $metricTotals[$field] = 0; |
| 155 | | - } |
| 156 | | - $metricTotals[$field] += $row->$field; |
| 157 | | - } |
| | 152 | + //foreach( $metricFields as $field ) { |
| | 153 | + // if ( !isset( $metricTotals[$field] ) ) { |
| | 154 | + // $metricTotals[$field] = 0; |
| | 155 | + // } |
| | 156 | + // $metricTotals[$field] += $row->$field; |
| | 157 | + //} |
| 158 | 158 | |
| 159 | 159 | // Make grouped output data |
| 160 | 160 | foreach( $this->getAllowedFilters() as $filter ) { |
| — | — | @@ -188,9 +188,9 @@ |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | $result->setIndexedTagName( $data, 'data' ); |
| 192 | | - $result->setIndexedTagName( $metricTotals, 'totals' ); |
| | 192 | + //$result->setIndexedTagName( $metricTotals, 'totals' ); |
| 193 | 193 | $result->addValue( 'metric', $this->getModuleName(), $data ); |
| 194 | | - $result->addValue( 'totals', $this->getModuleName(), $metricTotals ); |
| | 194 | + //$result->addValue( 'totals', $this->getModuleName(), $metricTotals ); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | // TODO: Deal with foo AS bar, and return bar for nicer aliasing of stuff |