Some refactoring of the results data handling.

1 files changed, 2 insertions, 22 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 6319d1e..c19d211 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -160,18 +160,8 @@ if nil == email then C("opening mirrors file - " .. e) else
                 "==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT ====\n" ..
                 "[skip] means that the test hasn't been written yet.\n\n")
     for k, v in APT.orderedPairs(APT.mirrors) do
-        local results = loadfile("results/" .. k .. ".lua")()
         email:write(k .. "....\n")
-        local IPs = v.IPs
-        for i, u in pairs(IPs) do
-            if "table" == type(u) then
-                for h, t in pairs(u) do
-                    results = APT.collate(k, h, results)
-                end
-            else
-                results = APT.collate(k, i, results)
-            end
-        end
+        local results = APT.collateAll('results', k)
         local ftp       = "[skip]"
         local http      = status(k, results, "http")
         local https     = status(k, results, "https")
@@ -325,7 +315,7 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "<th>Protocol</th><th>URL sanity</th><th>Integrity</th><th>Updated</th><th colspan='2'>Speed range</th></tr>\n"
                 )
     for k, v in APT.orderedPairs(APT.mirrors) do
-        local results = loadfile("results/" .. k .. ".lua")()
+        local results = APT.collateAll('results', k)
         local active = ""
         if "yes" == v.Active then
             web:write("     <tr><th>" .. k .. "</th> ")
@@ -333,16 +323,6 @@ if nil == web then C("opening mirrors file - " .. e) else
             if nil == v.Active then active = 'nil' else active = v.Active end
             web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
         end
-        local IPs = v.IPs
-        for i, u in pairs(IPs) do
-            if "table" == type(u) then
-                for h, t in pairs(u) do
-                    results = APT.collate(k, h, results)
-                end
-            else
-                results = APT.collate(k, i, results)
-            end
-        end
         local ftp       = "[<font color='grey'><b>skip</b></font>]"
         local http      = status(k, results, "http")
         local https     = status(k, results, "https")