Add copyright notice, COPYING file.
And fix some whitespace.
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/render.js b/render.js
index 7b6a596..0adf8ef 100644
--- a/render.js
+++ b/render.js
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
'use strict';
var afterquery = (function() {
@@ -238,8 +253,8 @@
}
return outgrid;
}
-
-
+
+
var colormap = {};
var next_color = 0;
@@ -311,14 +326,14 @@
}
return acc;
},
-
+
color: function(l) {
for (var i in l) {
- var v = l[i];
- if (!(v in colormap)) {
- colormap[v] = ++next_color;
- }
- return colormap[v];
+ var v = l[i];
+ if (!(v in colormap)) {
+ colormap[v] = ++next_color;
+ }
+ return colormap[v];
}
}
};
@@ -347,7 +362,7 @@
var colnum = keyToColNum(ingrid, field);
if (!func) {
if (ingrid.types[colnum] === T_NUM ||
- ingrid.types[colnum]===T_BOOL) {
+ ingrid.types[colnum]===T_BOOL) {
func = agg_funcs.sum;
} else {
func = agg_funcs.count;
@@ -463,8 +478,8 @@
}
return out;
}
-
-
+
+
function treeJoinKeys(ingrid, nkeys) {
var outgrid = {
headers: ['_tree'].concat(ingrid.headers.slice(nkeys)),
@@ -476,13 +491,13 @@
var row = ingrid.data[rowi];
var key = row.slice(0, nkeys);
var newkey = stringifiedCols(row.slice(0, nkeys),
- ingrid.types.slice(0, nkeys)).join('|');
+ ingrid.types.slice(0, nkeys)).join('|');
outgrid.data.push([newkey].concat(row.slice(nkeys)));
}
return outgrid;
}
-
-
+
+
function finishTree(ingrid, keys) {
if (keys.length < 1) {
keys = ['_tree'];
@@ -492,46 +507,46 @@
for (var keyi in keys) {
keycols.push(keyToColNum(ingrid, keys[keyi]));
}
-
+
var seen = {};
var needed = {};
for (var rowi in ingrid.data) {
var row = ingrid.data[rowi];
var key = [];
for (var keyi in keycols) {
- var keycol = keycols[keyi];
- key.push(row[keycol]);
+ var keycol = keycols[keyi];
+ key.push(row[keycol]);
}
seen[key] = 1;
delete needed[key];
outgrid.data.push(row);
-
+
var treekey = key.pop().split('|');
while (treekey.length > 0) {
- treekey.pop();
- var pkey = key.concat([treekey.join('|')]);
- if (pkey in needed || pkey in seen) break;
- needed[pkey] = [treekey.slice(), row];
+ treekey.pop();
+ var pkey = key.concat([treekey.join('|')]);
+ if (pkey in needed || pkey in seen) break;
+ needed[pkey] = [treekey.slice(), row];
}
}
-
+
var treecol = keycols.pop();
for (var needkey in needed) {
var treekey = needed[needkey][0];
var inrow = needed[needkey][1];
var outrow = []
for (var keycoli in keycols) {
- var keycol = keycols[keycoli];
- outrow[keycol] = inrow[keycol];
+ var keycol = keycols[keycoli];
+ outrow[keycol] = inrow[keycol];
}
outrow[treecol] = treekey.join('|');
outgrid.data.push(outrow);
}
-
+
return outgrid;
}
-
-
+
+
function invertTree(ingrid, key) {
if (!key) {
key = '_tree';
@@ -547,8 +562,8 @@
}
return outgrid;
}
-
-
+
+
function crackTree(ingrid, key) {
if (!key) {
key = '_tree';
@@ -557,38 +572,38 @@
var outgrid = {
headers:
[].concat(ingrid.headers.slice(0, keycol),
- ['_id', '_parent'],
- ingrid.headers.slice(keycol + 1)),
+ ['_id', '_parent'],
+ ingrid.headers.slice(keycol + 1)),
data: [],
types:
[].concat(ingrid.types.slice(0, keycol),
- [T_STRING, T_STRING],
- ingrid.types.slice(keycol + 1))
+ [T_STRING, T_STRING],
+ ingrid.types.slice(keycol + 1))
};
-
+
for (var rowi in ingrid.data) {
var row = ingrid.data[rowi];
var key = row[keycol];
var pkey;
if (!key) {
- key = 'ALL';
- pkey = '';
+ key = 'ALL';
+ pkey = '';
} else {
- var keylist = key.split('|');
- keylist.pop();
- pkey = keylist.join('|');
- if (!pkey) {
- pkey = 'ALL';
- }
+ var keylist = key.split('|');
+ keylist.pop();
+ pkey = keylist.join('|');
+ if (!pkey) {
+ pkey = 'ALL';
+ }
}
outgrid.data.push([].concat(row.slice(0, keycol),
- [key, pkey],
- row.slice(keycol + 1)));
+ [key, pkey],
+ row.slice(keycol + 1)));
}
return outgrid;
}
-
+
function splitNoEmpty(s, splitter) {
if (!s) return [];
return s.split(splitter);
@@ -742,7 +757,7 @@
var row = ingrid.data[rowi];
var cell = row[keycol];
if (cell == undefined) {
- cell = null;
+ cell = null;
}
var found = 0;
for (var valuei in wantvals) {
@@ -789,8 +804,8 @@
for (var opi in ops) {
var op = ops[opi];
if ((parts = trySplitOne(argval, op))) {
- var matches = parts[1].split(',');
- console.debug('filterBy parsed:', parts[0], op, matches);
+ var matches = parts[1].split(',');
+ console.debug('filterBy parsed:', parts[0], op, matches);
grid = filterBy(grid, parts[0], op, matches);
console.debug('grid:', grid);
return grid;
@@ -807,20 +822,20 @@
var row = ingrid.data[rowi];
var found = 0, skipped = 0;
for (var wordi in words) {
- var word = words[wordi];
- if (word[0] == '!' || word[0] == '-') {
- found = 1;
- }
+ var word = words[wordi];
+ if (word[0] == '!' || word[0] == '-') {
+ found = 1;
+ }
for (var coli in row) {
var cell = row[coli];
if (cell.toString().indexOf(word) >= 0) {
found = 1;
break;
} else if ((word[0] == '!' || word[0] == '-') &&
- cell.toString().indexOf(word.substr(1)) >= 0) {
- skipped = 1;
- break;
- }
+ cell.toString().indexOf(word.substr(1)) >= 0) {
+ skipped = 1;
+ break;
+ }
}
if (found || skipped) break;
}
@@ -1023,8 +1038,8 @@
};
step(0);
}
-
-
+
+
function maybeSet(dict, key, value) {
if (!(key in dict)) {
dict[key] = value;
@@ -1080,12 +1095,12 @@
enqueue('gentable', function() {
if (chartops) {
- var chartbits = chartops.split(',');
- var charttype = chartbits.shift();
- for (var charti in chartbits) {
- var kv = trySplitOne(chartbits[charti], '=');
- options[kv[0]] = kv[1];
- }
+ var chartbits = chartops.split(',');
+ var charttype = chartbits.shift();
+ for (var charti in chartbits) {
+ var kv = trySplitOne(chartbits[charti], '=');
+ options[kv[0]] = kv[1];
+ }
if (charttype == 'stacked' || charttype == 'stackedarea') {
// Some charts react badly to missing values, so fill them in.
grid = fillNullsWithZero(grid);
@@ -1123,13 +1138,13 @@
} else if (charttype == 'pie') {
t = new google.visualization.PieChart(el);
} else if (charttype == 'tree') {
- if (grid.headers[0] == '_tree') {
- grid = finishTree(grid, ['_tree']);
- grid = crackTree(grid, '_tree');
- }
- maybeSet(options, 'maxDepth', 3);
- maybeSet(options, 'maxPostDepth', 1);
- maybeSet(options, 'showScale', 1);
+ if (grid.headers[0] == '_tree') {
+ grid = finishTree(grid, ['_tree']);
+ grid = crackTree(grid, '_tree');
+ }
+ maybeSet(options, 'maxDepth', 3);
+ maybeSet(options, 'maxPostDepth', 1);
+ maybeSet(options, 'showScale', 1);
t = new google.visualization.TreeMap(el);
} else if (charttype == 'candle' || charttype == 'candlestick') {
t = new google.visualization.CandlestickChart(el);