Merge pull request #104 from pagreene/preassembly-fix

Fix minor bugs in preassembly
gyorilab · May 18, 2020 · 20ebe57 · 20ebe57
2 parents 41c3197 + 76eff96
commit 20ebe57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/indra_db/managers/preassembly_manager.py b/indra_db/managers/preassembly_manager.py
@@ -176,7 +176,7 @@ def _condense_statements(self, cleaned_stmts, mk_done, new_mk_set,
         evidence_links = defaultdict(lambda: set())
         agent_tuples = set()
         for s in cleaned_stmts:
-            h = shash(s)
+            h = s.get_hash(refresh=True)
 
             # If this statement is new, make it.
             if h not in mk_done and h not in new_mk_set:

diff --git a/indra_db/util/insert.py b/indra_db/util/insert.py
@@ -344,7 +344,7 @@ def insert_pa_stmts(db, stmts, verbose=False, do_copy=True,
     if do_copy:
         db.copy('pa_statements', stmt_data, cols, commit=False)
         db.copy('pa_activity', activity_rows,
-                ('mk_hash', 'activity', 'is_active'), commit=commit)
+                ('stmt_mk_hash', 'activity', 'is_active'), commit=commit)
     else:
         db.insert_many('pa_statements', stmt_data, cols=cols)
     if not ignore_agents: