summaryrefslogtreecommitdiff
path: root/datastore-leveldb
diff options
context:
space:
mode:
authorYves Fischer <yvesf-git@xapek.org>2013-04-18 17:34:27 +0200
committerYves Fischer <yvesf-git@xapek.org>2013-04-18 17:34:27 +0200
commit87f4134201f0a0840415aab531e32ca714bc7a36 (patch)
treecf148ecc810f92ca2e4c177498a56130806ed4e4 /datastore-leveldb
parent7c8e064216cc672557cbf3892ff090490505e408 (diff)
downloadebus-alt-87f4134201f0a0840415aab531e32ca714bc7a36.tar.gz
ebus-alt-87f4134201f0a0840415aab531e32ca714bc7a36.zip
leveldb geht so
Diffstat (limited to 'datastore-leveldb')
-rw-r--r--datastore-leveldb/.gitignore2
-rw-r--r--datastore-leveldb/Makefile4
-rw-r--r--datastore-leveldb/bin/insert_testdata.py19
-rw-r--r--datastore-leveldb/src/db.cpp3
-rw-r--r--datastore-leveldb/src/server.cpp (renamed from datastore-leveldb/src/main.cpp)0
-rw-r--r--datastore-leveldb/src/web.cpp27
-rw-r--r--datastore-leveldb/wwwroot/control.html (renamed from datastore-leveldb/wwwroot/public/control.html)0
-rw-r--r--datastore-leveldb/wwwroot/css/stylesheet.css (renamed from datastore-leveldb/wwwroot/public/css/stylesheet.css)0
-rw-r--r--datastore-leveldb/wwwroot/draw.svg (renamed from datastore-leveldb/wwwroot/public/draw.svg)0
-rw-r--r--datastore-leveldb/wwwroot/index.html10
-rw-r--r--datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.js (renamed from datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.time.js (renamed from datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.time.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/API.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/API.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/FAQ.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/FAQ.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/LICENSE.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/LICENSE.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/Makefile (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/Makefile)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/NEWS.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/NEWS.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/PLUGINS.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/PLUGINS.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/README.txt (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/README.txt)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/ajax.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/ajax.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/annotating.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/annotating.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-down.gif (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-down.gif)bin916 -> 916 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-left.gif (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-left.gif)bin891 -> 891 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-right.gif (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-right.gif)bin897 -> 897 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-up.gif (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-up.gif)bin916 -> 916 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/basic.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/basic.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-1.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-1.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-2.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-2.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-3.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-3.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-4.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-4.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-5.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-5.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-japan-gdp-growth.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-japan-gdp-growth.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-usa-gdp-growth.json (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-usa-gdp-growth.json)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/graph-types.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/graph-types.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg)bin34489 -> 34489 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/image.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/image.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/index.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/index.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting-axes.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting-axes.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/layout.css (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/layout.css)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/multiple-axes.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/multiple-axes.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/navigate.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/navigate.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/percentiles.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/percentiles.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/pie.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/pie.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/realtime.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/realtime.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/resize.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/resize.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/selection.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/selection.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/setting-options.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/setting-options.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/stacking.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/stacking.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/symbols.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/symbols.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/thresholding.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/thresholding.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/time.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/time.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/tracking.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/tracking.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/turning-series.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/turning-series.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/visitors.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/visitors.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/examples/zooming.html (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/zooming.html)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/flot-0.7/jquery.min.js (renamed from datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.js (renamed from datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.min.js (renamed from datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png)bin180 -> 180 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png)bin178 -> 178 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png)bin120 -> 120 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png)bin105 -> 105 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png)bin111 -> 111 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png)bin110 -> 110 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png)bin119 -> 119 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png)bin101 -> 101 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png)bin4369 -> 4369 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png)bin4369 -> 4369 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png)bin4369 -> 4369 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png)bin4369 -> 4369 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png)bin4369 -> 4369 bytes
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css)0
-rw-r--r--datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js (renamed from datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js)0
-rw-r--r--datastore-leveldb/wwwroot/src/d3.control.js (renamed from datastore-leveldb/wwwroot/public/src/d3.control.js)0
-rw-r--r--datastore-leveldb/wwwroot/src/d3.plot.js (renamed from datastore-leveldb/wwwroot/public/src/d3.plot.js)0
-rw-r--r--datastore-leveldb/wwwroot/src/ebus.js (renamed from datastore-leveldb/wwwroot/public/src/ebus.js)13
105 files changed, 51 insertions, 27 deletions
diff --git a/datastore-leveldb/.gitignore b/datastore-leveldb/.gitignore
index f0c9b81..0b44b98 100644
--- a/datastore-leveldb/.gitignore
+++ b/datastore-leveldb/.gitignore
@@ -1,2 +1,2 @@
*.o
-main
+bin/server
diff --git a/datastore-leveldb/Makefile b/datastore-leveldb/Makefile
index 03d8d43..6a6c9a3 100644
--- a/datastore-leveldb/Makefile
+++ b/datastore-leveldb/Makefile
@@ -1,5 +1,5 @@
-OBJ= src/web.o src/db.o src/main.o mongoose/mongoose.o
-OUT = main
+OBJ= src/web.o src/db.o src/server.o mongoose/mongoose.o
+OUT = bin/server
CFLAGS += -Wall -DNO_CGI -DNO_POPEN -DUSE_IPV6 -DNO_SSL
CXXFLAGS += -Wall -std=c++11 -Imongoose
diff --git a/datastore-leveldb/bin/insert_testdata.py b/datastore-leveldb/bin/insert_testdata.py
new file mode 100644
index 0000000..d1fd74a
--- /dev/null
+++ b/datastore-leveldb/bin/insert_testdata.py
@@ -0,0 +1,19 @@
+import random
+import math
+import time
+import requests
+
+s = ["heizkreisregler9.solarDaten.tempKollektor",
+ "heizkreisregler10.betriebsdatenRegler1.kesselTemperatur",
+ "feuerungsautomat1.betriebsdatenRegler1.aussenTemperatur"]
+
+MINUTE = 1000 * 60
+DAY = MINUTE * 60 * 24
+NOW = long(time.time()*1000)
+for i in range(NOW-14*DAY, NOW, MINUTE):
+ for j,sensor in zip(range(len(s)),s):
+ x = (float(i)/DAY)+j
+ requests.put("http://localhost:8080/api/value/"+sensor+"/"+str(i),
+ str(50+50*math.sin(x)))
+
+
diff --git a/datastore-leveldb/src/db.cpp b/datastore-leveldb/src/db.cpp
index a952512..84e30f3 100644
--- a/datastore-leveldb/src/db.cpp
+++ b/datastore-leveldb/src/db.cpp
@@ -12,7 +12,8 @@ static bool sensor_name_is_sane(std::string& name) {
for (auto it = name.begin(); it != name.end(); ++it) {
if (not ((*it >= '0' and *it <= '9') or
(*it >= 'A' and *it <= 'Z') or
- (*it >= 'a' and *it <= 'z'))) {
+ (*it >= 'a' and *it <= 'z') or
+ (*it == '.'))) {
return false;
}
}
diff --git a/datastore-leveldb/src/main.cpp b/datastore-leveldb/src/server.cpp
index 3000a25..3000a25 100644
--- a/datastore-leveldb/src/main.cpp
+++ b/datastore-leveldb/src/server.cpp
diff --git a/datastore-leveldb/src/web.cpp b/datastore-leveldb/src/web.cpp
index 2adf8eb..efff6b9 100644
--- a/datastore-leveldb/src/web.cpp
+++ b/datastore-leveldb/src/web.cpp
@@ -23,7 +23,7 @@ static inline bool parse_key(leveldb::Slice &&key, uint64_t *value) {
const boost::regex web_handle_api_value_R(
- "/api/value/([a-zA-Z0-9]+)/([0-9]+)");
+ "/api/value/([a-zA-Z0-9\\.]+)/([0-9]+)");
void web_handle_api_value(const boost::cmatch &match, struct mg_connection *conn) {
std::string sensor(match[1].str());
uint64_t timestamp = std::stoul(match[2].str());
@@ -69,7 +69,7 @@ static inline void print_json_tuple(struct mg_connection *conn,
const boost::regex web_handle_api_range_R(
- "/api/range/([a-zA-Z0-9]+)/([0-9]+)/([0-9]+)");
+ "/api/range/([a-zA-Z0-9\\.]+)/([0-9]+)/([0-9]+)");
void web_handle_api_range(const boost::cmatch &match, struct mg_connection *conn) {
std::string sensor(match[1].str());
uint64_t start = std::stoul(match[2].str());
@@ -86,11 +86,13 @@ void web_handle_api_range(const boost::cmatch &match, struct mg_connection *conn
mg_printf(conn,
"HTTP/1.1 200 OK\r\n"
- "Content-Type: application/json; encoding=UTF-8\r\n"
+ "Content-Type: application/json\r\n"
"\r\n");
std::ostringstream out;
- out << "{'sensor':'" << sensor << "', 'error':null, 'data':[";
+ out << "{\"sensor\":\"" << sensor << "\", "
+ << "\"error\":null, "
+ << "\"data\":[";
mg_write(conn, out.str().c_str(), out.str().size());
leveldb::Iterator* it = db->NewIterator(leveldb::ReadOptions());
@@ -109,7 +111,7 @@ void web_handle_api_range(const boost::cmatch &match, struct mg_connection *conn
}
const boost::regex web_handle_api_range_size_R(
- "/api/range/([a-zA-Z0-9]+)/([0-9]+)/([0-9]+)/([0-9]+)");
+ "/api/range/([a-zA-Z0-9\\.]+)/([0-9]+)/([0-9]+)/([0-9]+)");
void web_handle_api_range_size(const boost::cmatch &match, struct mg_connection *conn) {
std::string sensor(match[1].str());
uint64_t start = std::stoul(match[2].str());
@@ -125,17 +127,17 @@ void web_handle_api_range_size(const boost::cmatch &match, struct mg_connection
mg_printf(conn,
"HTTP/1.1 200 OK\r\n"
- "Content-Type: application/json; encoding=UTF-8\r\n"
+ "Content-Type: application/json\r\n"
"\r\n");
uint64_t step = std::max((uint64_t)1, (end-start) / size);
std::ostringstream out;
- out << "{'sensor':'" << sensor << "', "
- << "'error':null, "
- << "'size':" << size << ", "
- << "'step':" << step << ", "
- << "'data':[";
+ out << "{\"sensor\":\"" << sensor << "\", "
+ << "\"error\":null, "
+ << "\"size\":" << size << ", "
+ << "\"step\":" << step << ", "
+ << "\"data\":[";
mg_write(conn, out.str().c_str(), out.str().size());
bool first = true;
@@ -144,6 +146,7 @@ void web_handle_api_range_size(const boost::cmatch &match, struct mg_connection
leveldb::Iterator* it = db->NewIterator(leveldb::ReadOptions());
for (uint64_t key = start; key <= end; key += step) {
it->Seek(make_key(key));
+ if (!it->Valid()) continue;
if (first) first = false;
else outbuf << ",";
@@ -152,6 +155,6 @@ void web_handle_api_range_size(const boost::cmatch &match, struct mg_connection
outbuf.seekp(0);
actual_size++;
}
- mg_printf(conn, "], 'actual_size':%ld}\r\n", actual_size);
+ mg_printf(conn, "], \"actual_size\":%ld}\r\n", actual_size);
delete it;
}
diff --git a/datastore-leveldb/wwwroot/public/control.html b/datastore-leveldb/wwwroot/control.html
index db9e7b8..db9e7b8 100644
--- a/datastore-leveldb/wwwroot/public/control.html
+++ b/datastore-leveldb/wwwroot/control.html
diff --git a/datastore-leveldb/wwwroot/public/css/stylesheet.css b/datastore-leveldb/wwwroot/css/stylesheet.css
index f114bc7..f114bc7 100644
--- a/datastore-leveldb/wwwroot/public/css/stylesheet.css
+++ b/datastore-leveldb/wwwroot/css/stylesheet.css
diff --git a/datastore-leveldb/wwwroot/public/draw.svg b/datastore-leveldb/wwwroot/draw.svg
index e3c46b5..e3c46b5 100644
--- a/datastore-leveldb/wwwroot/public/draw.svg
+++ b/datastore-leveldb/wwwroot/draw.svg
diff --git a/datastore-leveldb/wwwroot/index.html b/datastore-leveldb/wwwroot/index.html
index f60e516..c69a9b1 100644
--- a/datastore-leveldb/wwwroot/index.html
+++ b/datastore-leveldb/wwwroot/index.html
@@ -1,10 +1,10 @@
<html>
<head>
- <link rel="stylesheet" type="text/css" href="public/css/stylesheet.css" />
- <script src="public/lib/jquery-1.6.2/jquery-1.6.2.min.js"></script>
- <script src="public/lib/flot-0.7/jquery.flot.js"></script>
- <script src="public/lib/flot-0.7/jquery.flot.selection.js"></script>
- <script src="public/src/ebus.js"></script>
+ <link rel="stylesheet" type="text/css" href="css/stylesheet.css" />
+ <script src="lib/jquery-1.6.2/jquery-1.6.2.min.js"></script>
+ <script src="lib/flot-0.7/jquery.flot.js"></script>
+ <script src="lib/flot-0.7/jquery.flot.selection.js"></script>
+ <script src="src/ebus.js"></script>
</head>
<body>
<div id="ebusgraph"></div>
diff --git a/datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.js b/datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.js
index d71f57d..d71f57d 100644
--- a/datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.js
+++ b/datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.js
diff --git a/datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.time.js b/datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.time.js
index 4c1cda4..4c1cda4 100644
--- a/datastore-leveldb/wwwroot/public/lib/d3-v2.6.1/d3.time.js
+++ b/datastore-leveldb/wwwroot/lib/d3-v2.6.1/d3.time.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/API.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/API.txt
index 8a8dbc2..8a8dbc2 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/API.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/API.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/FAQ.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/FAQ.txt
index e02b761..e02b761 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/FAQ.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/FAQ.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/LICENSE.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/LICENSE.txt
index 07d5b20..07d5b20 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/LICENSE.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/LICENSE.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/Makefile b/datastore-leveldb/wwwroot/lib/flot-0.7/Makefile
index b300f1a..b300f1a 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/Makefile
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/Makefile
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/NEWS.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/NEWS.txt
index 5f8e1a0..5f8e1a0 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/NEWS.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/NEWS.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/PLUGINS.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/PLUGINS.txt
index af3d90b..af3d90b 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/PLUGINS.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/PLUGINS.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/README.txt b/datastore-leveldb/wwwroot/lib/flot-0.7/README.txt
index 1e49787..1e49787 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/README.txt
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/README.txt
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/ajax.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/ajax.html
index 9b5ec85..9b5ec85 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/ajax.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/ajax.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/annotating.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/annotating.html
index 72c212b..72c212b 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/annotating.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/annotating.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-down.gif b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-down.gif
index e239d11..e239d11 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-down.gif
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-down.gif
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-left.gif b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-left.gif
index 93ffd5a..93ffd5a 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-left.gif
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-left.gif
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-right.gif b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-right.gif
index 5fd0530..5fd0530 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-right.gif
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-right.gif
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-up.gif b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-up.gif
index 7d19626..7d19626 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/arrow-up.gif
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/arrow-up.gif
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/basic.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/basic.html
index b116d94..b116d94 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/basic.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/basic.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-1.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
index 51952cf..51952cf 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-2.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
index 82004d6..82004d6 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-3.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
index 8684479..8684479 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-4.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
index b363578..b363578 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-5.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
index a7e1e13..a7e1e13 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth.json
index a7e1e13..a7e1e13 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-eu-gdp-growth.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-eu-gdp-growth.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-japan-gdp-growth.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-japan-gdp-growth.json
index 855477c..855477c 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-japan-gdp-growth.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-japan-gdp-growth.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-usa-gdp-growth.json b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-usa-gdp-growth.json
index 33f66c6..33f66c6 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/data-usa-gdp-growth.json
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/data-usa-gdp-growth.json
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/graph-types.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/graph-types.html
index dd21a31..dd21a31 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/graph-types.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/graph-types.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
index a1d5c05..a1d5c05 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/image.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/image.html
index 073ad43..073ad43 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/image.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/image.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/index.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/index.html
index f24f750..f24f750 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/index.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/index.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting-axes.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting-axes.html
index 5b6e3bb..5b6e3bb 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting-axes.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting-axes.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting.html
index d04eedd..d04eedd 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/interacting.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/interacting.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/layout.css b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/layout.css
index 7ef7dd4..7ef7dd4 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/layout.css
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/layout.css
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/multiple-axes.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/multiple-axes.html
index 4b32e64..4b32e64 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/multiple-axes.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/multiple-axes.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/navigate.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/navigate.html
index c916ef2..c916ef2 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/navigate.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/navigate.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/percentiles.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/percentiles.html
index 9f2ba3a..9f2ba3a 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/percentiles.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/percentiles.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/pie.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/pie.html
index 8f51411..8f51411 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/pie.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/pie.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/realtime.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/realtime.html
index 3b427e1..3b427e1 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/realtime.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/realtime.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/resize.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/resize.html
index d1e18c3..d1e18c3 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/resize.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/resize.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/selection.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/selection.html
index 1646f5a..1646f5a 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/selection.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/selection.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/setting-options.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/setting-options.html
index 8d1967e..8d1967e 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/setting-options.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/setting-options.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/stacking.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/stacking.html
index b7de391..b7de391 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/stacking.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/stacking.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/symbols.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/symbols.html
index e71b1aa..e71b1aa 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/symbols.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/symbols.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/thresholding.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/thresholding.html
index f10144a..f10144a 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/thresholding.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/thresholding.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/time.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/time.html
index da62347..da62347 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/time.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/time.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/tracking.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/tracking.html
index c116159..c116159 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/tracking.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/tracking.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/turning-series.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/turning-series.html
index bc6fd9f..bc6fd9f 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/turning-series.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/turning-series.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/visitors.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/visitors.html
index 8a9d4d7..8a9d4d7 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/visitors.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/visitors.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/zooming.html b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/zooming.html
index 9a4ef22..9a4ef22 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/examples/zooming.html
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/examples/zooming.html
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.js b/datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.js
index c40d6f7..c40d6f7 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.min.js
index 12c74f7..12c74f7 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/excanvas.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/excanvas.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.js
index d3524d7..d3524d7 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.min.js
index 7f44c57..7f44c57 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.colorhelpers.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.colorhelpers.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.js
index 1d433f0..1d433f0 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.min.js
index ccaf240..ccaf240 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.crosshair.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.crosshair.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.js
index 69700e7..69700e7 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.min.js
index 47f3dfb..47f3dfb 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.fillbetween.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.fillbetween.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.js
index 29ccb12..29ccb12 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.min.js
index 9480c1e..9480c1e 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.image.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.image.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.js
index aabc544..aabc544 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.min.js
index 4467fc5..4467fc5 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.js
index f2b9760..f2b9760 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.min.js
index ecf63c9..ecf63c9 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.navigate.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.navigate.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.js
index 70941dd..70941dd 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.min.js
index b7bf870..b7bf870 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.pie.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.pie.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.js
index 69dfb24..69dfb24 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.min.js
index 1fa0771..1fa0771 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.resize.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.resize.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.js
index 7f7b326..7f7b326 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.min.js
index badc005..badc005 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.selection.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.selection.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.js
index a31d5dc..a31d5dc 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.min.js
index bba2a0e..bba2a0e 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.stack.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.stack.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.js
index a32fe31..a32fe31 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.min.js
index 272e003..272e003 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.symbol.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.symbol.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.js
index 0b2e7ac..0b2e7ac 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.min.js
index d8b79df..d8b79df 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.flot.threshold.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.flot.threshold.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.js
index 78fcfa4..78fcfa4 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.js
diff --git a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.min.js b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.min.js
index 6422523..6422523 100644
--- a/datastore-leveldb/wwwroot/public/lib/flot-0.7/jquery.min.js
+++ b/datastore-leveldb/wwwroot/lib/flot-0.7/jquery.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.js b/datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.js
index f3201aa..f3201aa 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.js
+++ b/datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.js
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.min.js b/datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.min.js
index 48590ec..48590ec 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-1.6.2/jquery-1.6.2.min.js
+++ b/datastore-leveldb/wwwroot/lib/jquery-1.6.2/jquery-1.6.2.min.js
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
index b273ff1..b273ff1 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
index 09d1cdc..09d1cdc 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
index 59bd45b..59bd45b 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
index 6d02426..6d02426 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
index 2ab019b..2ab019b 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
Binary files differ
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
index ad212da..ad212da 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
diff --git a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
index f9e4f1e..f9e4f1e 100644
--- a/datastore-leveldb/wwwroot/public/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
+++ b/datastore-leveldb/wwwroot/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
diff --git a/datastore-leveldb/wwwroot/public/src/d3.control.js b/datastore-leveldb/wwwroot/src/d3.control.js
index 489edea..489edea 100644
--- a/datastore-leveldb/wwwroot/public/src/d3.control.js
+++ b/datastore-leveldb/wwwroot/src/d3.control.js
diff --git a/datastore-leveldb/wwwroot/public/src/d3.plot.js b/datastore-leveldb/wwwroot/src/d3.plot.js
index d9a7d04..d9a7d04 100644
--- a/datastore-leveldb/wwwroot/public/src/d3.plot.js
+++ b/datastore-leveldb/wwwroot/src/d3.plot.js
diff --git a/datastore-leveldb/wwwroot/public/src/ebus.js b/datastore-leveldb/wwwroot/src/ebus.js
index 27802a9..126db7d 100644
--- a/datastore-leveldb/wwwroot/public/src/ebus.js
+++ b/datastore-leveldb/wwwroot/src/ebus.js
@@ -55,7 +55,7 @@ $(document).ready(function(){
"color":"red"},
{"sensorname":"heizkreisregler10.betriebsdatenRegler1.boilerTemperatur",
"description":"Boilertemperatur",
- "show":true,
+ "show":false,
"color":"#48b4ff"},
{"sensorname":"feuerungsautomat1.betriebsdatenRegler1.kesselTemperatur",
"description":"Kesseltemperatur",
@@ -63,11 +63,11 @@ $(document).ready(function(){
"color":"blue"},
{"sensorname":"de.wettermichel.temperature",
"description":"Aussentemperatur",
- "show":true,
+ "show":false,
"color":"yellow"},
{"sensorname":"yves.laserjet.tonerstatus",
"description":"Fuellstand Toner %",
- "show":true,
+ "show":false,
"color":"black"}
];
@@ -119,8 +119,9 @@ $(document).ready(function(){
unplotSensorOverview(sensorname);
};
var plotSensorDetail = function(sensorConfig) {
- $.getJSON("sensor/"+escape(sensorConfig.sensorname)+"/"+timeToLocal(from)+"/"+timeToLocal(to),
+ $.getJSON("/api/range/"+escape(sensorConfig.sensorname)+"/"+timeToLocal(from)+"/"+timeToLocal(to)+"/800",
function(response) {
+ console.log("foo");
if (!response.error) {
response.data = response.data.map(function(d) {
return [ timeToUTC(d[0]), d[1] ];
@@ -136,7 +137,7 @@ $(document).ready(function(){
} else {
alert("Fehler: " + response["error"]);
}
- });
+ }).fail(function(a) { console.log(a); });
};
var unplotSensorDetail = function(sensorname) {
@@ -150,7 +151,7 @@ $(document).ready(function(){
};
var plotSensorOverview = function(sensorConfig) {
- $.getJSON("avg/"+escape(sensorConfig.sensorname)+"/"+timeToLocal(fromOverview)+"/"+timeToLocal(toOverview),
+ $.getJSON("api/range/"+escape(sensorConfig.sensorname)+"/"+timeToLocal(fromOverview)+"/"+timeToLocal(toOverview) + "/800",
function(response) {
if (!response.error) {
response.data = response.data.map(function(d) {