Changed package structure

.gitignore

@@ -3,4 +3,3 @@ test/
 *__pycache__*
 build/
 regina.egg-info/
-regina/test/

regina/__init__.py

@@ -1,4 +1,2 @@
-"""Gather analytics from nginx access logs and visualize them through generated images and a generated html"""
-# __package__ = 'regina'
-
-from regina import database
+"""Gather analytics from nginx access logs and visualize them through generated plots and a generated html"""
+from regina.database import Database

regina/data_collection/__init__.py

@@ -0,0 +1 @@
+"""log parsing"""

regina/sql/city_ranking.sql

@@ -0,0 +1,13 @@
+-- unused
+SELECT ci.name,COUNT(v.visitor_id)
+FROM city as ci, visitor as v, ip_range as i
+WHERE ci.city_id = i.city_id
+AND i.ip_range_id = v.ip_range_id
+AND EXISTS(
+    SELECT 1
+    FROM request AS r
+    WHERE r.visitor_id = v.visitor_id
+    AND r.time BETWEEN {timestamps[0]} AND {timestamps[1]}
+)
+GROUP BY ci.name
+ORDER BY COUNT(v.visitor_id)

regina/sql/country.sql

@@ -0,0 +1,8 @@
+-- unused
+SELECT co.name,COUNT(v.visitor_id)
+FROM country as co, city as ci, visitor as v, ip_range as i
+WHERE co.country_id = ci.country_id
+    AND ci.city_id = i.city_id
+    AND i.ip_range_id = v.ip_range_id
+GROUP BY co.name
+ORDER BY COUNT(v.visitor_id)