fixing fallback #39 #35

DLR-TS · Jun 30, 2022 · f14449d · f14449d
1 parent b5c7aae
commit f14449d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/s2t_miv.py b/s2t_miv.py
@@ -234,8 +234,6 @@ def upload_all_pairs(conn, tables, start, end, vType, real_routes, rep_routes, n
 def create_all_pairs(conn, key, params):
     cursor = conn.cursor()
     schema_table, table, exists = db_manipulator.check_schema_table(conn, 'temp', '%s_%s' % (params[SP.od_output], key))
-    if exists:
-        cursor.execute("DROP TABLE " + schema_table)
     createQuery = """
 CREATE TABLE %s
 (
@@ -250,6 +248,7 @@ def create_all_pairs(conn, key, params):
 )
 """
     try:
+        cursor.execute("DROP TABLE IF EXISTS " + schema_table)
         cursor.execute(createQuery % (schema_table, table))
     except Exception:
         conn.rollback()

diff --git a/tsc_main.py b/tsc_main.py
@@ -449,11 +449,7 @@ def simulation_request(options, request):
             _, _, exists = db_manipulator.check_schema_table(conn, 'temp', '%s_%s' % (params[SP.trip_output], sim_key))
             if not exists or options.overwrite:
                 write_status('>> starting trip result database upload', sim_key, params, conn)
-                try:
-                    s2t_miv.upload_trip_results(conn, sim_key, params, final_routes)
-                except ProgrammingError as message:
-                    conn.rollback()
-                    write_status(message, sim_key, params, conn, constants.MSG_TYPE.error)
+                s2t_miv.upload_trip_results(conn, sim_key, params, final_routes)
                 write_status('<< finished trip result database upload', sim_key, params, conn)
                 print()
             # run all pair calculations