Seperate processing for COM and ACTI in duplicate_conference

modules/check_tools.py

@@ -8,6 +8,7 @@ import regex
 from gluon import current
 from plugin_dbui import (UNDEF,
                          UNDEF_ID,
+                         get_id,
                          get_where_query)
 
 
@@ -285,36 +286,34 @@ def duplicate_conference(publication):
     categories = db.categories
     publications = db.publications
 
-    qcat = (categories.code == 'ACTI') | \
-           (categories.code == 'ACTN') | \
-           (categories.code == 'COM')
+    if publications.id_categories == get_id(db.categories, code='COM'):
+        qcat = categories.code == 'COM'
+
+    else:
+        qcat = (categories.code == 'ACTI') | (categories.code == 'ACTN')
 
     qmain = get_where_query(publications)
-    qmain = ((qmain) & (qcat))
-    qmain = ((qmain) & (publications.id_teams == publication['id_teams']))
-    qmain = ((qmain) & (publications.title == publication['title']))
+    qmain &= qcat
+    qmain &= publications.id_teams == publication['id_teams']
+    qmain &= publications.title == publication['title']
 
     if 'id' in publication and publication['id']:
-        qmain = ((qmain) & (publications.id != publication['id']))
+        qmain &= publications.id != publication['id']
 
     # title, conference title, conference date and conference town
     qtitle = publications.conference_title == publication['conference_title']
     qdates = publications.conference_dates == publication['conference_dates']
     qtown = publications.conference_town == publication['conference_town']
 
-    query = ((qmain) & (qtitle))
-    query = ((query) & (qdates))
-    query = ((query) & (qtown))
+    query = ((qmain) & (qtitle) & (qdates) & (qtown))
     extend_ids(db, query, ids)
 
     # title, conference date and conference town
-    query = ((query) & (qdates))
-    query = ((query) & (qtown))
+    query = ((qmain) & (qdates) & (qtown))
     extend_ids(db, query, ids)
 
     # title, conference title and conference town
-    query = ((qmain) & (qtitle))
-    query = ((query) & (qtown))
+    query = ((qmain) & (qtitle) & (qtown))
     extend_ids(db, query, ids)
 
     return ids