1 files changed, 7 insertions, 8 deletions

diff --git a/export.py b/export.py
index 97ad669..8ddff42 100755
--- a/export.py
+++ b/export.py
@@ -11,7 +11,7 @@ import sys
 dryrun=False
 
 parser = ArgumentParser(description="C3 rating helper")
-parser.add_argument("-d", action="store_true", dest="dryrun", default=False, help="Don't actually execute anything on frab or rt, just show what would have been done")
+parser.add_argument("-d", action="store_true", dest="dryrun", default=False, help="Don't actually execute anything on pretalx or rt, just show what would have been done")
 args = parser.parse_args()
 
 if args.dryrun:
@@ -21,7 +21,7 @@ with open(args.config, mode="r", encoding="utf-8") as json_file:
     cfg = json.load(json_file)
 
 app = Flask(__name__)
-app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + cfg['frab-conference'] + '-' + cfg['track'] + '.db'
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + cfg['pretalx-conference'] + '-' + cfg['track'] + '.db'
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 app.config['SECRET_KEY'] = 'Silence is golden. Gerd Eist.'
 app.jinja_env.trim_blocks = True
@@ -30,13 +30,12 @@ app.jinja_env.lstrip_blocks = True
 db = SQLAlchemy(app)
 
 config['rt-rest-url'] = cfg['rt-url'] + 'REST/1.0/'
-config['frab-conf-url'] = config['frab-url'] + config['frab-conference']
+config['pretalx-conf-url'] = config['pretalx-url'] + config['pretalx-conference']
 
 class Event(db.Model):
-    """An event as dumped from frab"""
-    frab_id = db.Column(db.Integer, primary_key=True)
+    """An event as dumped from pretalx"""
+    pretalx_id = db.Column(db.String(16), primary_key=True)
     title = db.Column(db.String(1024))
-    subtitle = db.Column(db.String(1024))
     abstract = db.Column(db.Text())
     description = db.Column(db.Text())
     state = db.Column(db.String(64))
@@ -49,13 +48,13 @@ class EventRating(db.Model):
     """A rating as given by a logged in user"""
     id = db.Column(db.Integer, primary_key=True)
     submitter = db.Column(db.String(1024))
-    event_id = db.Column(db.Integer, db.ForeignKey('event.frab_id'))
+    event_id = db.Column(db.Integer, db.ForeignKey('event.pretalx_id'))
     event = db.relationship('Event', backref=db.backref('ratings', lazy='dynamic'))
     comment = db.Column(db.Text())
     rating_dict = db.Column(db.String(1024), server_default="{}")
 
 def add_coordinator(sess, person, event):
-    edit_person_page = sess.get(config['frab-conf-url'] + '/events/' + event + '/edit_people')
+    edit_person_page = sess.get(config['pretalx-conf-url'] + '/events/' + event + '/edit_people')
     tree = etree.HTML(edit_person_page.text)
     for option in tree.xpath('//option[@selected]'):
         if option.text.lower() == 'coordinator':