From 4daa602797444de52977f9e37e30a1c80dfd1964 Mon Sep 17 00:00:00 2001
From: vitalif <vitalif@36fad67d-d860-417a-a578-348738f88402>
Date: Fri, 30 Jul 2010 06:16:33 +0000
Subject: [PATCH] empty field, &nbsp

---
 olap.php                         | 13 ++++++++++---
 templates/default/admin_olap.tpl |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/olap.php b/olap.php
index d22b2e5..38d62ff 100644
--- a/olap.php
+++ b/olap.php
@@ -49,6 +49,8 @@ class OLAP
         set_time_limit(300);
         $time_start = microtime(true);
         $template->compiletime_functions['fformat'] = "OLAP::tpl_field_format";
+        foreach (self::$sources as $k => &$s)
+            $s['id'] = $k;
         self::$current_srcid = $request['datasource'];
         self::$current_src = self::$sources[self::$current_srcid];
         $template->vars('sources', array_values(self::$sources));
@@ -244,9 +246,14 @@ class OLAP
     static function sql_trans_field($field, $func)
     {
         $fd = &self::$current_src['fielddescs'][$field];
-        $sql = $field;
-        if ($fd['sql'])
-            $sql = $fd['sql'];
+        if ($field === '')
+            $sql = '1';
+        else
+        {
+            $sql = $field;
+            if ($fd['sql'])
+                $sql = $fd['sql'];
+        }
         if ($fd['is_time'] && $fd['format'] == TS_UNIX &&
             (!self::$functions[$func] || self::$functions[$func]['time_format']))
             $sql = "FROM_UNIXTIME($sql)";
diff --git a/templates/default/admin_olap.tpl b/templates/default/admin_olap.tpl
index 6da0b11..440da32 100644
--- a/templates/default/admin_olap.tpl
+++ b/templates/default/admin_olap.tpl
@@ -87,7 +87,7 @@
         и &le; <input type="hidden" name="field-{i}" value="{s f.id}" /><input type="hidden" name="type-{i}" value="le" /><input style="width: 100px" type="text" name="value-{i}" value="{s get(wh,concat('value-',i))}" /><!-- SET i = add(i,1) -->
         <!-- END -->
         <!-- IF f.is_time --> (YYYY-MM-DD HH:MM:SS)<!-- END -->
-        <!-- IF eq(concat('',f.id),'in_trust') --> (0-9)<!-- END -->
+        {f.comment}
     </td></tr>
 <!-- END -->
 </table>
@@ -109,7 +109,7 @@
   <!-- SET cv = get(get(data,v),k) -->
   <!-- IF hascg -->
    <!-- FOR ck = keys(cv) -->
-    {fformat(cell_group_field,cell_group_func,'',ck)}: {fformat(cell_field,cell_func,cell_aggr,get(cv,ck))}<br />
+    {fformat(cell_group_field,cell_group_func,'',ck)}:&nbsp;{fformat(cell_field,cell_func,cell_aggr,get(cv,ck))}<br />
    <!-- END -->
   <!-- ELSE -->
    {fformat(cell_field,cell_func,cell_aggr,cv)}