if object references to empty cache then refresh one

ChildMindInstitute · Nov 10, 2022 · 78e5fb4 · 78e5fb4
1 parent 755d2de
commit 78e5fb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/girderformindlogger/models/applet.py b/girderformindlogger/models/applet.py
@@ -1924,6 +1924,9 @@ def getNextAppletData(self, activities, nextActivity, bufferSize):
                 activity,
                 'activity'
             )
+            if not formattedActivity:
+                print('formattedActivity is empty. ActivityId=' + str(activity['_id']))
+                continue
 
             buffer['activities'][activityIRI] = formattedActivity['activity']
             buffer['items'].update(formattedActivity['items'])

diff --git a/girderformindlogger/utility/jsonld_expander.py b/girderformindlogger/utility/jsonld_expander.py
@@ -1666,7 +1666,12 @@ def formatLdObject(
                 oc is not None
             ]):
                 if mesoPrefix == 'item' or mesoPrefix == 'screen' or obj.get('meta', {}).get('schema', '') == APPLET_SCHEMA_VERSION:
-                    return(loadCache(oc))
+                    cached = loadCache(oc)
+                    if cached is not None:
+                        return cached
+                    else:
+                        refreshCache=True
+                        reimportFromUrl=False
                 else:
                     return {}