Fix dbxref queries if a synonym contains the same text as the dbxref.

Closes #80

annotations/views.py

@@ -129,7 +129,13 @@ def get_context_data(self, **kwargs):
         db_references = annotation.db_reference.split("|")
         for db_reference in db_references:
             dbname = db_reference.split(':')[0]
-            db_reference_dict[db_reference] = DBXref.objects.get(Q(dbname=dbname) | Q(synonyms__icontains=dbname))
+            try:
+                db_reference_dict[db_reference] = DBXref.objects.get(Q(dbname=dbname))
+            except DBXref.DoesNotExist:
+                try:
+                    db_reference_dict[dbname] = DBXref.objects.get(synonyms__icontains=dbname)
+                except DBXref.DoesNotExist:
+                    db_reference_dict[dbname] = None
         context['db_references_dict'] = db_reference_dict
         # Get the count of changes that been approved for this annotation
         change_count = AnnotationApproval.objects.filter(source_annotation=annotation, status=choices.ApprovalStates.APPROVED).count()

dbxrefs/templatetags/dbxref_templatetags.py

@@ -21,7 +21,13 @@ def example_id_db_remove(id, db):
 def get_dbxref_url(object):
     db = object.split(':')[0]
     id = object.split(':', 1)[1]
-    dbxref = DBXref.objects.get(Q(dbname=db) | Q(synonyms__icontains=db))
+    try:
+        dbxref = DBXref.objects.get(Q(dbname=db))
+    except DBXref.DoesNotExist:
+        try:
+            dbxref = DBXref(Q(synonyms__icontains=db))
+        except DBXref.DoesNotExist:
+            dbxref = None
     return dbxref_url_replace(dbxref.xrefURL, id)
 
 @register.filter(name='get_id_from_dbxref')