Refactored ExtractArchivalObjectContainer function to accept a topcontainer object

Author: Austin Schaffer

Aeon-ArchivesSpace-Addon/Aeon-ArchivesSpace.lua

@@ -391,7 +391,8 @@ function PopulateDataGrid()
 
             for _, v in ipairs(archivalObject.instances) do
                 local itemRow = itemsDataTable:NewRow();
-                availableData["ArchivalObjectContainer"] = ExtractArchivalObjectContainer(sessionId, v);
+                local topContainer = GetTopContainerFromAPI(sessionId, v)
+                availableData["ArchivalObjectContainer"] = ExtractArchivalObjectContainer(v, topContainer);
                 itemRow:set_item(mapping["Title"].ItemGridColumn, availableData[mapping["Title"].AspaceData]);
                 itemRow:set_item(mapping["SubTitle"].ItemGridColumn, availableData[mapping["SubTitle"].AspaceData]);
                 itemRow:set_item(mapping["CallNumber"].ItemGridColumn, availableData[mapping["CallNumber"].AspaceData]);
@@ -503,7 +504,17 @@ function ExtractDigitalObjectCitation(sessionId, json)
     return availableData;
 end
 
-function ExtractArchivalObjectContainer(sessionId, archivalObjectInstance)
+function GetTopContainerFromAPI(sessionId, archivalObjectInstance)
+    if (archivalObjectInstance.sub_container ~= nil and archivalObjectInstance.sub_container ~= JsonParser.NIL) then
+        local topContainerUri = archivalObjectInstance.sub_container.top_container.ref;
+        local topContainer = ArchivesSpaceGetRequest(sessionId, topContainerUri);
+        return topContainer
+    end
+
+    return nil
+end
+
+function ExtractArchivalObjectContainer(archivalObjectInstance, topContainer)
     local container = "";
 
     if (archivalObjectInstance.container ~= nil and archivalObjectInstance.container ~= JsonParser.NIL) then
@@ -514,9 +525,7 @@ function ExtractArchivalObjectContainer(sessionId, archivalObjectInstance)
         if (archivalObjectInstance.container.type_2 ~= nil and archivalObjectInstance.container.type_2 ~= JsonParser.NIL) then
             container = container .. ', ' .. archivalObjectInstance.container.type_2 .. " " .. archivalObjectInstance.container.indicator_2;
         end
-    elseif(archivalObjectInstance.sub_container ~= nil and archivalObjectInstance.sub_container ~= JsonParser.NIL) then
-        local topContainerUri = archivalObjectInstance.sub_container.top_container.ref;
-        local topContainer = ArchivesSpaceGetRequest(sessionId, topContainerUri);
+    elseif (topContainer) then
         container = topContainer.long_display_string;
     end