diff --git a/legacy.py b/legacy.py index 7cf650ed4111543d0580ed5b73d45a7641f7cd4e..3764780a8d67bb4b085514ff9a4d5fda87805dc0 100644 --- a/legacy.py +++ b/legacy.py @@ -62,10 +62,10 @@ def import_old_protocols(sql_text): deleted, sent, document_id) in _split_insert_line(protocol_line): date = datetime.strptime(date, "%Y-%m-%d") handle = type_id_to_handle[int(old_type_id)] - type = ProtocolType.query.filter(ProtocolType.short_name.ilike(handle)).first() - if type is None: + protocoltype = ProtocolType.query.filter(ProtocolType.short_name.ilike(handle)).first() + if protocoltype is None: raise KeyError("No protocoltype for handle '{}'.".format(handle)) - protocol = Protocol(type.id, date, source=source) + protocol = Protocol(protocoltype.id, date, source=source) db.session.add(protocol) db.session.commit() import tasks @@ -73,6 +73,7 @@ def import_old_protocols(sql_text): for protocol in sorted(protocols, key=lambda p: p.date): print(protocol.date) tasks.parse_protocol(protocol) + print("done importing") def import_old_todos(sql_text): @@ -106,7 +107,7 @@ def import_old_todos(sql_text): for old_id, protocol_id, who, what, start_time, end_time, done in _split_insert_line(todo_line): protocol_id = int(protocol_id) if protocol_id not in protocol_id_to_key: - print("Missing protocol with ID {} for Todo {}".format(protocol_id, what)) + #print("Missing protocol with ID {} for Todo {}".format(protocol_id, what)) continue todo = OldTodo(old_id=old_id, who=who, description=what, protocol_key=protocol_id_to_key[protocol_id]) diff --git a/server.py b/server.py index 44dbca03cbec77d0ddd85ceafd88b743a0fe5e10..576b09a46f29bea13db161bebac41bd1f1419335 100755 --- a/server.py +++ b/server.py @@ -86,8 +86,8 @@ def import_legacy(): """Import the old todos and protocols from an sql dump""" filename = prompt("SQL-file") #filename = "legacy.sql" - with open(filename, "r") as sqlfile: - content = sqlfile.read() + with open(filename, "rb") as sqlfile: + content = sqlfile.read().decode("utf-8") import_old_todos(content) import_old_protocols(content) diff --git a/templates/decision.tex b/templates/decision.tex index 6a98ccb9e7451707d03828429ea08251948f6334..c61cb9e28109b3f64aed3172eab750a0089aae90 100644 --- a/templates/decision.tex +++ b/templates/decision.tex @@ -27,7 +27,7 @@ {\bf Datum:} & \VAR{protocol.date|datify_long|escape_tex}\\ \ENV{endif} \ENV{for meta in protocol.metas} - {\bf \ENV{meta.name|escape_tex}:} & \VAR{meta.value|escape_tex}\\ + {\bf \VAR{meta.name|escape_tex}:} & \VAR{meta.value|escape_tex}\\ \ENV{endfor} \end{tabular} \normalsize