commit 5ba8b0a7d78ef516ae7473b24058d6764c224655
author Avery Pennarun <apenwarr@gmail.com> Fri Jan 04 12:15:41 2013 -0500
committer Avery Pennarun <apenwarr@gmail.com> Fri Jan 04 12:15:41 2013 -0500
tree 65551380898fccd6fc5ffb5b8c3db16cc17961f9
parent ccb4d7d8af5dee31957de0b8f7cfa59f9a8491a4
parent 2495cc8ae5cf0b32bcf1d37b38686ec2479becc6

Merge branch 'master' of gh:apenwarr/afterquery

* 'master' of gh:apenwarr/afterquery:
  Add the avg() aggregate function.
  In tables, add URL formatting.
  Forgot some return types for some aggregate functions.
  Add count_nz (count nonzero) aggregation function.

render.js

diff --git a/render.js b/render.js
index b60a752..2926584 100644
--- a/render.js
+++ b/render.js
@@ -90,8 +90,39 @@
   }
 
 
+  var IS_URL_RE = RegExp('^(http|https)://');
+
+  function looksLikeUrl(s) {
+    var url, label;
+    var pos = (s || '').lastIndexOf('|');
+    if (pos >= 0) {
+      url = s.substr(0, pos);
+      label = s.substr(pos + 1);
+    } else {
+      url = s;
+      label = s;
+    }
+    if (IS_URL_RE.exec(s)) {
+      return [url, label];
+    } else {
+      return;
+    }
+  }
+
+
+  function htmlEscape(s) {
+    if (s == undefined) {
+      return s;
+    }
+    return s.replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+  }
+
+
   function dataToGvizTable(grid, options) {
     if (!options) options = {};
+    var is_html = options.allowHtml;
     var headers = grid.headers, data = grid.data, types = grid.types;
     var dheaders = [];
     for (var i in headers) {
@@ -105,7 +136,17 @@
     for (var rowi in data) {
       var row = [];
       for (var coli in data[rowi]) {
-        var col = { v: data[rowi][coli] };
+        var cell = data[rowi][coli];
+        if (is_html && types[coli] === T_STRING) {
+          var urlresult = looksLikeUrl(cell);
+          if (urlresult) {
+            cell = '<a href="' + encodeURI(urlresult[0]) + '">' +
+                htmlEscape(urlresult[1]) + '</a>';
+          } else {
+            cell = htmlEscape(cell);
+          }
+        }
+        var col = { v: cell };
         if (options.show_only_lastseg && col.v && col.v.split) {
           var lastseg = col.v.split('|').pop();
           if (lastseg != col.v) {
@@ -316,6 +357,16 @@
       return l.length;
     },
 
+    count_nz: function(l) {
+      var acc = 0;
+      for (var i in l) {
+        if (l[i] != null && l[i] != 0) {
+          acc++;
+        }
+      }
+      return acc;
+    },
+
     count_distinct: function(l) {
       var a = {};
       for (var i in l) {
@@ -332,11 +383,15 @@
       var acc;
       if (l.length) acc = 0;
       for (var i in l) {
-        acc += parseFloat(l[i]);
+        acc += parseFloat(l[i]) || 0;
       }
       return acc;
     },
 
+    avg: function(l) {
+      return agg_funcs.sum(l) / agg_funcs.count_nz(l);
+    },
+
     color: function(l) {
       for (var i in l) {
         var v = l[i];
@@ -348,7 +403,12 @@
     }
   };
   agg_funcs.count.return_type = T_NUM;
+  agg_funcs.count_nz.return_type = T_NUM;
+  agg_funcs.count_distinct.return_type = T_NUM;
   agg_funcs.sum.return_type = T_NUM;
+  agg_funcs.avg.return_type = T_NUM;
+  agg_funcs.cat.return_type = T_STRING;
+  agg_funcs.color.return_type = T_NUM;
 
 
   function groupBy(ingrid, keys, values) {
@@ -1208,7 +1268,8 @@
       } else {
         var el = document.getElementById('viztable');
         t = new google.visualization.Table(el);
-        datatable = dataToGvizTable(grid);
+        datatable = dataToGvizTable(grid, { allowHtml: true });
+        options.allowHtml = true;
       }
 
       var wantwidth = trace ? window.innerWidth - 40 : window.innerWidth;