1 files changed, 32 insertions, 8 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index dc64fa2..bddf63a 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -248,21 +248,45 @@ for name, file in pairs(Files) do
     end
 end
 
+
+
+-- Figure out the original title and link for the original wiki.
+-- This functions assume the above file and sub scan has completed.
+local whichWiki = function(metadata)
+    local title, link = '', ''
+    if 'PmWiki'  == metadata.ogWiki then
+        title = '[' .. metadata.ogBase .. '.'    .. metadata.ogFile .. ']'
+        link  = '(' .. metadata.ogURL  .. '/?n=' .. metadata.ogBase .. '.' .. metadata.ogFile .. ')'
+    end
+    if 'Foswiki' == metadata.ogWiki then
+        title = '[' .. metadata.ogBase .. '/'    .. metadata.ogFile .. ']'
+        link  = '(' .. metadata.ogURL  .. '/'    .. metadata.ogBase .. '/' .. metadata.ogFile .. ')'
+    end
+    return title, link
+end
+
+
 -- Create an "everything" page, for URL links to every file.HTML.
--- TODO - sort the list of pages.
 local bdy, h = Files['everything'].body, io.open('everything.md', 'a+')
-bdy = bdy .. '\n\n| page | converted | Foswiki | PmWiki | \n| ---- | --------- | ------- | ------ | '
+bdy = bdy .. '\n\n| page | converted | original page | last edited UTC | \n| ---- | --------- | ------- | --------------- | '
+pages = {}
 for name, file in pairs(Files) do
     local metadata = derefTable(Files[name].metadata, true)
     if 'everything' ~= name then
-        local ln, fw, pw = 'DUNNO', '', ''
-        if 'PmWiki'  == metadata.ogWiki then pw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
-        if 'Foswiki' == metadata.ogWiki then fw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
+        local ln, fw, pw, ts = 'DUNNO', '', '', ''
+        local title, link = whichWiki(metadata)
+        if 'PmWiki'  == metadata.ogWiki then pw = 'PmWiki  ' .. title .. link end
+        if 'Foswiki' == metadata.ogWiki then fw = 'Foswiki ' .. title .. link end
+        if nil       ~= metadata.timestamp then ts = metadata.timestamp end
         if nil ~= file.bit   then ln = file.bit
         end
-        bdy = bdy .. '\n| ' .. name .. ' | [' .. ln .. '](<' .. name .. '.HTML>) | ' .. fw .. ' | ' .. pw .. ' |'
+        table.insert(pages, '\n| ' .. name .. ' | [' .. ln .. '](<' .. name .. '.HTML>) | ' .. fw .. '  ' .. pw .. ' | ' .. ts .. ' |')
     end
 end
+table.sort(pages, function(a, b) return (string.lower(a) < string.lower(b))  end)
+for i, f in ipairs(pages) do
+    bdy = bdy .. f
+end
 h:write(bdy)
 h:close()
 toFile('everything', 'body', parse(bdy))
@@ -330,7 +354,6 @@ local linkFrom = function(source, dest)
 end
 
 
-
 -- More of this actually doing things nonsense.
 
 -- Loop through Subs, doing whichPage and inheritance.
@@ -375,7 +398,8 @@ for name, file in pairs(Files) do
         for             m, x in pairs(globalData)               do if nil == metadata[m] then metadata[m] = x end end
 
         if nil ~= metadata.ogURL then
-            body = body .. '\n\n---\n\n[Original page](' .. metadata.ogURL .. '), maybe you can edit it.\n'
+            local title, link = whichWiki(metadata)
+            body = body .. '\n\n---\n\n[Original page]' .. link .. ', maybe you can edit it.\n'
         end
 
         -- Figure out this pages trail links.