/[drupal]/contributions/modules/views_calc/views_calc_table.inc
ViewVC logotype

Diff of /contributions/modules/views_calc/views_calc_table.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.15, Wed Apr 22 02:21:41 2009 UTC revision 1.16, Sat Jun 13 11:53:20 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: views_calc_table.inc,v 1.14 2009/04/21 13:09:16 karens Exp $  // $Id: views_calc_table.inc,v 1.15 2009/04/22 02:21:41 karens Exp $
3  /**  /**
4   * @file   * @file
5   * Copied from the table style plugin.   * Copied from the table style plugin.
# Line 167  class views_calc_table extends views_plu Line 167  class views_calc_table extends views_plu
167      foreach ($this->view->field as $field) {      foreach ($this->view->field as $field) {
168        $query_field = substr($field->field, 0, 3) == 'cid' ? $field->definition['calc'] : $field->table .'.'. $field->field;        $query_field = substr($field->field, 0, 3) == 'cid' ? $field->definition['calc'] : $field->table .'.'. $field->field;
169        $query_alias = $field->field_alias;        $query_alias = $field->field_alias;
170          // Bail if we have a broken handler.
171          if ($query_alias == 'unknown') {
172            continue;
173          }
174        if (in_array($field->field, $fields)) {        if (in_array($field->field, $fields)) {
175          // Calculated fields.          // Calculated fields.
176          $this->view->query->add_field(NULL, "$calc($query_field)", $query_alias);          $this->view->query->add_field(NULL, "$calc($query_field)", $query_alias);
# Line 206  class views_calc_table extends views_plu Line 210  class views_calc_table extends views_plu
210      foreach ($this->view->field as $field) {      foreach ($this->view->field as $field) {
211        $query_field = substr($field->field, 0, 3) == 'cid' ? $field->definition['calc'] : $field->table .'.'. $field->field;        $query_field = substr($field->field, 0, 3) == 'cid' ? $field->definition['calc'] : $field->table .'.'. $field->field;
212        $query_alias = $field->field_alias;        $query_alias = $field->field_alias;
213          // Bail if we have a broken handler.
214          if ($query_alias == 'unknown') {
215            continue;
216          }
217        $this->view->query->add_table($field->table, NULL, NULL, $field->table);        $this->view->query->add_table($field->table, NULL, NULL, $field->table);
218        if (!empty($fields) && in_array($field->field, $fields)) {        if (!empty($fields) && in_array($field->field, $fields)) {
219          // Calculated fields.          // Calculated fields.
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16
  ViewVC Help
Powered by ViewVC 1.1.2