vitalif
/
olap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debug

master
vitalif 2010-11-01 19:22:42 +00:00
parent d0daca7548
commit 15a43042cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
olap.php
View File

@ -117,7 +117,7 @@ class OLAP
} }
if (!$fd || !strlen($v)) if (!$fd || !strlen($v))
continue; continue;
$wh["where-$t-$f"] = $v; $wh[$k] = $v;
if ($fd['is_time']) if ($fd['is_time'])
$v = Template::timestamp($v, self::$current_src['fielddescs'][$f]['format']); $v = Template::timestamp($v, self::$current_src['fielddescs'][$f]['format']);
$dn = $fd['sql']; $dn = $fd['sql'];
@ -184,6 +184,7 @@ class OLAP
foreach ($group_fields as $i => &$v) foreach ($group_fields as $i => &$v)
{ {
$v['sql'] = self::sql_trans_field($v['field'], $v['func']); $v['sql'] = self::sql_trans_field($v['field'], $v['func']);
$v['keys'] = array();
$fields[] = $v['sql'].' f'.$i; $fields[] = $v['sql'].' f'.$i;
$group_by[] = $v['sql']; $group_by[] = $v['sql'];
} }
@ -526,8 +527,8 @@ class OLAP
static function build_tables($group_fields, &$data, &$tdkeys) static function build_tables($group_fields, &$data, &$tdkeys)
{ {
$bytype = array(); $bytype = array();
foreach ($group_fields as &$gf) foreach ($group_fields as $gf)
$bytype[$gf['type']][] = &$gf; $bytype[$gf['type']][] = $gf;
$tables = self::recurse_tables($group_fields, $bytype, $data, $tdkeys); $tables = self::recurse_tables($group_fields, $bytype, $data, $tdkeys);
return $tables; return $tables;
} }