Remove explicit get_db and now calling Session.remove() at the end of requests.

[philipp/winterrodeln/wradmin.git] / wradmin / __init__.py

diff --git a/wradmin/__init__.py b/wradmin/__init__.py
index ca17b6f5b9e9de1efe94f0aad69c934ab61fcb93..0c450c64eb539834c1db78057605403049292186 100644 (file)
--- a/wradmin/__init__.py
+++ b/wradmin/__init__.py
@@ -8,28 +8,18 @@ from wradmin.genshi import render_genshi_template
 from wradmin.controllers.rodelbahn import RodelbahnController
 from wradmin.controllers.gasthaus import GasthausController
 from wradmin.controllers.bericht import BerichtController
+from wradmin.controllers.coordtool import CoordtoolController
 
 
 app = Flask(__name__)
 app.config.from_envvar('WRADMIN_SETTINGS')
-
-
-def get_db():
-    """Opens a new database connection if there is none yet for the
-    current application context.
-    """
-    if not hasattr(g, 'db'):
-        g.db_engine = create_engine(app.config['DATABASE_URI'])
-        wradmin.model.init_model(g.db_engine)
-        g.db = g.db_engine.connect()
-    return g.db
+wradmin.model.init_model(create_engine(app.config['DATABASE_URI']))
 
 
 @app.teardown_appcontext
-def close_db(error):
-    """Closes the database again at the end of the request."""
-    if hasattr(g, 'db'):
-        g.db.close()
+def remove_db_session(error):
+    """Removes the database session at the end of the request."""
+    wradmin.model.meta.Session.remove()
 
 
 @app.route("/")
@@ -39,64 +29,59 @@ def index():
 
 @app.route("/rodelbahn/list")
 def rodelbahn_list():
-    get_db()
     return RodelbahnController().list()
 
 
 @app.route("/rodelbahn/view/<int:id>")
 def rodelbahn_view(id):
-    get_db()
     return RodelbahnController().view(id)
 
 
 @app.route("/rodelbahn/update")
 def rodelbahn_update():
-    get_db()
     return RodelbahnController().update()
 
 
 @app.route("/rodelbahn/update_regioncache")
 def rodelbahn_update_regioncache():
-    get_db()
-    return RodelbahnController().update()
+    return RodelbahnController().update_regioncache()
 
 
 @app.route("/bericht/list")
 def bericht_list():
-    get_db()
     return BerichtController().list()
 
 
 @app.route("/bericht/view/<int:id>")
 def bericht_view(id):
-    get_db()
     return BerichtController().view(id)
 
 
 @app.route("/bericht/change_date_invalid/<int:id>", methods=['POST'])
 def bericht_change_date_invalid(id):
-    get_db()
-    return BerichtController().view(id)
+    return BerichtController().change_date_invalid(id)
 
 
 @app.route("/gasthaus/list")
 def gasthaus_list():
-    get_db()
     return GasthausController().list()
 
 
 @app.route("/gasthaus/view/<int:id>")
 def gasthaus_view(id):
-    get_db()
     return GasthausController().view(id)
 
 
 @app.route("/gasthaus/update")
 def gasthaus_update():
-    get_db()
     return GasthausController().update()
 
 
 @app.route("/coordtool/index")
 def coordtool_index():
-    pass
+    return CoordtoolController().index()
+
+
+@app.route("/coordtool/convert", methods=['POST'])
+def coordtool_convert():
+    return CoordtoolController().convert()