Whitespace cosmetics.

[philipp/winterrodeln/wradmin.git] / wradmin / controllers / rodelbahn.py

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 00be2c909e9e9c44e32e5669d43c9956f573337d..f6bd26d31acdc342f3bb7ff8c4890e2bfe0e5f28 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,62 +1,78 @@
-#!/usr/bin/python2.6
-# -*- coding: iso-8859-15 -*-
-import logging
-
-from pylons import request, response, session, url, tmpl_context as c
-from pylons.controllers.util import abort, redirect
-import webhelpers.paginate as paginate
-
-from wradmin.lib.base import BaseController, render
-import wradmin.model as model
+#!/usr/bin/python3.4
+from flask import request, abort, redirect, url_for, flash, render_template
+import paginate

 import sqlalchemy as sa
 import sqlalchemy as sa

-import formencode
-import re

 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache

+import wrpylib.mwmarkup

 
 

-from weberror import collector        # Prevent a bug of weberror # See https://bitbucket.org/bbangert/weberror/issue/3/nameerror-global-name-fallback_encoding-is-not
-collector.FALLBACK_ENCODING = 'utf-8' # --"--
-
-log = logging.getLogger(__name__)
-
-
-class RodelbahnController(BaseController):
+import wradmin.model as model

 
 

-    def index(self):
-        return render('index.html')

 
 

+class RodelbahnController:

 
     def list(self):
 
     def list(self):

-        "Lists all sled runs"
+        """Lists all sled runs"""

         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)

-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_list.html')
-    
-    
+        paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                  url_maker=lambda page: url_for('rodelbahn_list', page=page),
+                                  items_per_page=25)
+        return render_template('rodelbahn_list.html', paginator=paginator)
+

     def view(self, id):
     def view(self, id):

-        "Displays a sled run"
+        """Displays a sled run"""

         q = model.meta.Session.query(model.WrSledrunCache)
         q = model.meta.Session.query(model.WrSledrunCache)

-        c.sledding =  q.get(id)
-        if c.sledding is None: abort(404)
+        sledding = q.get(id)
+        if sledding is None:
+            abort(404)

         q = model.meta.Session.query(model.WrReport)
         q = q.filter_by(page_id=id).order_by(sa.sql.expression.desc(model.WrReport.id))
         q = model.meta.Session.query(model.WrReport)
         q = q.filter_by(page_id=id).order_by(sa.sql.expression.desc(model.WrReport.id))

-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_view.html')
-    
-    
+        paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                  url_maker=lambda page: url_for('rodelbahn_view', id=id, page=page),
+                                  items_per_page=25)
+        return render_template('rodelbahn_view.html', sledding=sledding, paginator=paginator)
+

     def update(self):
     def update(self):

-        "Updates the wrsledruncache table from the wiki"
+        """Updates the wrsledruncache table from the wiki"""

         c = model.meta.Session.connection()
         try:
             wrpylib.wrmwcache.update_wrsledruncache(c)
             model.meta.Session.commit()
         c = model.meta.Session.connection()
         try:
             wrpylib.wrmwcache.update_wrsledruncache(c)
             model.meta.Session.commit()

-            session['flash'] = u'Die Rodelbahnliste wurde erfolgreich aktualisiert.'
+            flash('Die Rodelbahnliste wurde erfolgreich aktualisiert.', 'info')
+        except wrpylib.wrmwcache.UpdateCacheError as e:
+            title = str(e.args[1])
+            title = wrpylib.mwmarkup.dbkey_to_title(title)
+            msg = str(e.args[2])
+            msg = msg.replace('\n', '; ')
+            if len(e.args) == 3:
+                flash("Fehler bei Rodelbahn '{0}': {1}".format(title, msg), 'error')
+            else:
+                flash(str(e), 'error')
+        # Redirect to result page
+        return redirect(url_for('rodelbahn_list'))
+
+    def update_regioncache(self):
+        """Updates the wrregioncache table from the wiki"""
+        c = model.meta.Session.connection()
+        try:
+            wrpylib.wrmwcache.update_wrregioncache(c)
+            model.meta.Session.commit()
+            flash('Die Rodelbahneinträge in den Regionslisten wurden erfolgreich aktualisiert.', 'info')

         except wrpylib.wrmwcache.UpdateCacheError as e:
         except wrpylib.wrmwcache.UpdateCacheError as e:

-            if len(e.args) == 3: session['flash'] = u"Fehler bei Rodelbahn '{0}': {1}".format(e.args[1], e.args[2])
-            else: session['flash'] = unicode(e)
-        session.save()
+            flash(str(e), 'error')

         # Redirect to result page
         # Redirect to result page

-        return redirect(url(controller='rodelbahn', action='list'))
+        return redirect(url_for('rodelbahn_list'))

 
 

+    def update_mapcache(self):
+        """Updates the wrmappointcache and wrmappathcache tables from the wiki."""
+        c = model.meta.Session.connection()
+        try:
+            wrpylib.wrmwcache.update_wrmapcache(c)
+            model.meta.Session.commit()
+            flash('Die Landkarteninformationen aus dem Wiki wurden erfolgreich aktualisiesrt.', 'info')
+        except wrpylib.wrmwcache.UpdateCacheError as e:
+            flash(str(e), 'error')
+        # Redirect to result page
+        return redirect(url_for('rodelbahn_list'))