Implement page history for Fos and Pm, and clean up the edit line.

2 files changed, 14 insertions, 6 deletions

diff --git a/TODO.md b/TODO.md
index 1e5c17a..089fe22 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,6 @@ Make it perphekd!
 
 Add atom feed for single page.  Alas cgit only seems to have ATOM feed on the whole repo, not individual files.
 
-- git.devuan.org might have usable per page history.
 - However, once timestamps are sorted, I can use that code to generate (static?) RSS and ATOM feeds, and create page histories using diffs.
 
 Fix up linky conversion.  DONE, mostly.
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index e389e74..4cf091e 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -804,8 +804,17 @@ for name, file in pairs(Files) do
         end
 
         -- Figure out this pages footer links.
+        local temp = ''
         metadata.footer = ''
-        if nil ~= metadata.pagehistory then metadata.history = '<p>Page&nbsp;<a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' else metadata.history = '' end
+        if nil == metadata.pagehistory then
+            if 'Foswiki'  == metadata.ogWiki then metadata.pagehistory =  metadata.ogURL .. '/bin/oops/' .. metadata.ogBase .. '/' .. metadata.ogFile  .. '?template=oopshistory' end
+            if 'PmWiki'   == metadata.ogWiki then metadata.pagehistory =  metadata.ogURL .. '/?n='       .. metadata.ogBase .. '.' .. metadata.ogFile  .. '?action=diff' end
+        else
+            temp = '/' .. name .. '.md'
+        end
+        if nil ~= metadata.pagehistory then metadata.history = '<p>Page&nbsp;<a href="' .. metadata.pagehistory .. temp .. '">history</a></p>' else
+            metadata.history = ''
+        end
         if nil ~= metadata.sourcecode   then metadata.footer = '<a href="' .. metadata.sourcecode       .. '">source code</a>'    end
         if nil ~= metadata.feedatom             then metadata.footer = '<a href="' .. metadata.feedatom         ..   '">atom feed</a> &nbsp; &nbsp; ' .. metadata.footer    end
         if metadata.footer ~= '' then metadata.footer = 'Web site ' .. metadata.footer end
@@ -814,10 +823,10 @@ for name, file in pairs(Files) do
             local title, link = whichWiki(metadata)
             link = string.gsub(link, 'https://', 'HTTPS://')    -- Prevent this one from being converted.
 -- TODO - wrap "edit" in a link to actually edit it. PmWiki "?action=edit"  Foswiki "https://fos.wiki.devuan.org/bit/edit/" .. page .. "?t=" .. 10 digit random number?
-            local edit = 'edit'
-            if 'PmWiki'  == metadata.ogWiki then edit = '<a href="' .. link .. '?action=edit">edit</a>' end
---          if 'Foswiki' == metadata.ogWiki then edit = 'edit' end
-            metadata.footer = '<a href="' .. link .. '">Original page</a>, maybe you can ' .. edit .. ' it. &nbsp; ' .. metadata.footer
+            local edit = 'T'
+            if 'PmWiki'  == metadata.ogWiki then edit = 'Maybe you can <a href="' .. link .. '?action=edit">edit</a> t' end
+--          if 'Foswiki' == metadata.ogWiki then edit = '' end
+            metadata.footer = edit .. 'he <a href="' .. link .. '">original page</a>. &nbsp; ' .. metadata.footer
         end
         metadata.footer = '<p>' .. metadata.footer .. '</p>'