Merge branch 'master' into develop

DOAJ · Mar 20, 2023 · ec0eb57 · ec0eb57
2 parents cf1e114 + ae55834
commit ec0eb57
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/doajtest/unit/test_fc_assed_app_review.py b/doajtest/unit/test_fc_assed_app_review.py
@@ -28,13 +28,15 @@ def editor_group_pull(cls, field, value):
 
 mock_lcc_choices = [
     ('H', 'Social Sciences'),
-    ('HB1-3840', '--Economic theory. Demography')
+    ('HB1-3840', '--Economic theory. Demography'),
+    ('SF600-1100', 'Veterinary medicine')
 ]
 
 
 def mock_lookup_code(code):
     if code == "H": return "Social Sciences"
     if code == "HB1-3840": return "Economic theory. Demography"
+    if code == "SF600-1100": return 'Veterinary medicine'
     return None
 
 

diff --git a/doajtest/unit/test_fc_editor_app_review.py b/doajtest/unit/test_fc_editor_app_review.py
@@ -25,15 +25,18 @@ def editor_group_pull(cls, field, value):
     eg.set_name("editorgroup")
     return eg
 
+
 mock_lcc_choices = [
     ('H', 'Social Sciences'),
-    ('HB1-3840', '--Economic theory. Demography')
+    ('HB1-3840', '--Economic theory. Demography'),
+    ('SF600-1100', 'Veterinary medicine')
 ]
 
 
 def mock_lookup_code(code):
     if code == "H": return "Social Sciences"
     if code == "HB1-3840": return "Economic theory. Demography"
+    if code == "SF600-1100": return 'Veterinary medicine'
     return None
 
 #####################################################################

diff --git a/doajtest/unit/test_fc_maned_app_review.py b/doajtest/unit/test_fc_maned_app_review.py
@@ -24,14 +24,18 @@ def editor_group_pull(cls, field, value):
     eg.set_name("editorgroup")
     return eg
 
+
 mock_lcc_choices = [
     ('H', 'Social Sciences'),
-    ('HB1-3840', '--Economic theory. Demography')
+    ('HB1-3840', '--Economic theory. Demography'),
+    ('SF600-1100', 'Veterinary medicine')
 ]
 
+
 def mock_lookup_code(code):
     if code == "H": return "Social Sciences"
     if code == "HB1-3840": return "Economic theory. Demography"
+    if code == "SF600-1100": return 'Veterinary medicine'
     return None
 
 

diff --git a/portality/models/v2/journal.py b/portality/models/v2/journal.py
@@ -364,9 +364,10 @@ def _generate_index(self):
         for subs in cbib.subject:
             scheme = subs.get("scheme")
             term = subs.get("term")
-            subjects.append(term)
-            schema_subjects.append(scheme + ":" + term)
-            classification.append(term)
+            if term:
+                subjects.append(term)
+                schema_subjects.append(scheme + ":" + term)
+                classification.append(term)
             if "code" in subs:
                 schema_codes.append(scheme + ":" + subs.get("code"))