Browse Source

Remove leftover db code

Gu1 11 years ago
parent
commit
c3b1f44fe9
2 changed files with 2 additions and 48 deletions
  1. 0 25
      ffdnispdb/__init__.py
  2. 2 23
      ffdnispdb/views.py

+ 0 - 25
ffdnispdb/__init__.py

@@ -11,31 +11,6 @@ babel = Babel(app)
 db = SQLAlchemy(app)
 
 
-def connect_db():
-    return sqlite3.connect(app.config['DATABASE'])
-
-#@app.before_request
-def before_request():
-    g.db = connect_db()
-    #g.db.execute("PRAGMA foreign_keys = ON")
-
-#@app.teardown_request
-def teardown_request(exception):
-    g.db.close()
-
-def query_db(query, args=(), one=False):
-    cur = g.db.execute(query, args)
-    rv = [dict((cur.description[idx][0], value)
-        for idx, value in enumerate(row)) for row in cur.fetchall()]
-    return (rv[0] if rv else None) if one else rv
-
-def init_db():
-    with closing(connect_db()) as db:
-        with app.open_resource('schema.sql') as f:
-            db.cursor().executescript(f.read())
-        db.commit()
-
-
 from . import views
 from . import models
 

+ 2 - 23
ffdnispdb/views.py

@@ -10,7 +10,7 @@ import string
 
 from . import forms
 from .constants import *
-from . import app, query_db, db
+from . import app
 from .models import ISP
 
 
@@ -18,15 +18,12 @@ from .models import ISP
 def home():
     return render_template('index.html', active_button="home")
 
-@app.route('/members')
-def members():
-    members = query_db('select * from fai where is_member = 1')
-    return render_template('members.html', members=members)
 
 @app.route('/projects')
 def project_list():
     return render_template('project_list.html', projects=ISP.query.filter_by(is_disabled=False))
 
+
 @app.route('/isp/<projectid>/')
 def project(projectid):
     p=ISP.query.filter_by(id=projectid, is_disabled=False).first()
@@ -93,24 +90,6 @@ def search():
     return render_template('search.html')
 
 
-@app.route('/api/<projects>.json')
-def projects_json(projects):
-    if projects == 'projects':
-        query = 'select * from fai'
-    elif projects == 'members':
-        query = 'select * from fai where is_member = 1'
-    else:
-        abort(404)
-    fais = dict()
-    for fai in query_db(query):
-        fais[fai['name']] = fai
-    return jsonify(fais)
-
-@app.route('/api/members_drupal')
-def members_drupal():
-    members = query_db('select * from fai where is_member = 1 order by shortname') 
-    return render_template('members_drupal.html', members=members)
-
 #------
 # Filters