From 35513e4ed57986eb4123f6927cda151a246b1ae6 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Sun, 26 Feb 2012 20:25:01 +0100 Subject: add new logging utility --- .gitignore | 1 + Makefile | 8 ++++++-- logger.vala | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 logger.vala diff --git a/.gitignore b/.gitignore index eb8c92e..4465792 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.so *.so.* demo +logger diff --git a/Makefile b/Makefile index aee11ca..ecbfe66 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ NAME:=libweatherstation.so SONAME=$(NAME).0 LONGNAME=$(NAME).0.0 -all: library demo +all: library demo logger library: $(LONGNAME) @ln -sf $(LONGNAME) $(SONAME) @@ -25,7 +25,11 @@ demo: demo.vala @echo "[VALAC] $^" @$(VALAC) --vapidir=. --Xcc=-I. --Xcc=-L. --Xcc=-lweatherstation --pkg posix --pkg libweatherstation $^ +logger: logger.vala + @echo "[VALAC] $^" + @$(VALAC) --vapidir=. --Xcc=-I. --Xcc=-L. --Xcc=-lweatherstation --pkg posix --pkg libweatherstation --pkg sqlite3 $^ + clean: - rm -f $(OBJECTS) $(LONGNAME) $(SONAME) $(NAME) demo + rm -f $(OBJECTS) $(LONGNAME) $(SONAME) $(NAME) demo logger .PHONY: all library clean diff --git a/logger.vala b/logger.vala new file mode 100644 index 0000000..73fea6d --- /dev/null +++ b/logger.vala @@ -0,0 +1,51 @@ +/* logger.vala + * Copyright (c) 2012, Sebastian Reichel + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +static const string create_cmd = "CREATE TABLE log (id INTEGER PRIMARY KEY ASC, temperature_indoor INTEGER, temperature_outdoor INTEGER, humidity_indoor INTEGER, humidity_outdoor INTEGER, pressure INTEGER, wind_average INTEGER, wind_gust INTEGER, wind_direction INTEGER, rain INTEGER);"; +static const string insert_cmd = "INSERT INTO log (\"temperature_indoor\", \"temperature_outdoor\", \"humidity_indoor\", \"humidity_outdoor\", \"pressure\", \"wind_average\", \"wind_gust\", \"wind_direction\", \"rain\") VALUES (\"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\");"; + +public static int main(string[] args) { + Sqlite.Database db; + var station = new Weather.Station(); + + if(args.length < 2) { + stderr.printf("Usage: %s /path/to/database\n", args[0]); + return 1; + } + + if(station == null) { + stderr.printf("weather station not found!\n"); + return 1; + } + + if (!FileUtils.test (args[1], FileTest.IS_REGULAR)) { + stderr.printf ("Database %s does not exist or is directory\n", args[1]); + return 1; + } + + if(Sqlite.Database.open(args[1], out db) != Sqlite.OK) { + stderr.printf ("Can't open database: %s\n", db.errmsg ()); + return 1; + } + + var header = station.read_header(); + var data = station.read_data(header.history_data_stack); + + db.exec(create_cmd); + db.exec(insert_cmd.printf(data.temperature_indoor, data.temperature_outdoor, data.humidity_indoor, data.humidity_outdoor, data.pressure, data.avg_wind_speed, data.gust_wind_speed, data.wind_direction, data.rain)); + + return 0; +} -- cgit v1.2.3