Start using polygLua.

1 files changed, 24 insertions, 24 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 29fe316..114af16 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -39,7 +39,7 @@ if nil ~= h then
     Template = h:read('*a')     -- NOTE - Lua 5.3 changes to not need the *, but ignores it if it's there.
     h:close()
 else
-    print('oops! No such file ' .. 'default.template')
+    E('oops! No such file ' .. 'default.template')
 end
 
 
@@ -108,7 +108,7 @@ local toFile = function(name, key, value)
     if '.md' ~= name:sub(-3, -1) then
         h = io.open(name .. '.md', 'r')
         if nil ~= h then
---          print('Parsing ' .. name .. '.md')
+--          D('Parsing ' .. name .. '.md')
             Context = Files[name]
             body = h:read('*a') ; h:close()
             -- Deal with my typical double spaced sentence endings, and other things.
@@ -164,13 +164,13 @@ end
 local readMdMd = function(name, metadata)
         local h1 = io.open(name .. '.md')
         if nil == h1 then
---          print('Could not open ' .. name .. '.md')
+--          E('Could not open ' .. name .. '.md')
             return {}
         else
             for l in h1:lines() do
                 for k, v in l:gmatch'(%w+)%s*=%s*(.+)' do 
                     if nil == v then
-                        print(name .. ' ' .. k)
+                        P(name .. ' ' .. k)
                     else
                         metadata[k] = v
                     end
@@ -184,7 +184,7 @@ end
 
 local commonLinky = function(l, body, u, url, beg, en, beg0, en0, bump)
                 if nil == url then
---                  print('OOPS! unknown linky  - @' .. l .. '\t\t\t' .. string.sub(body, beg - 9, en) .. ' ' .. string.sub(body, en + 1, en0))
+--                  W('OOPS! unknown linky  - @' .. l .. '\t\t\t' .. body:sub(beg - 9, en) .. ' ' .. body:sub(en + 1, en0))
                 else
                     local md = readMdMd(url, {})
 --                  if nil ~= md then
@@ -216,7 +216,7 @@ h = io.open('everything.md', 'w')
 if nil ~= h then
     h:close()
 else
-    print("Can't open everything.md for writing.")
+    E"Can't open everything.md for writing."
 end
 
 -- Scan the sub folders looking for our files.
@@ -253,7 +253,7 @@ for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md
     if nil ~= metadata then
 -- DUNNO if this writes to the original file, or overwrites the symlink.
         local a, e = io.open(l, 'w')
-        if nil == a then print('Could not open ' .. l .. ' - ' .. e) else
+        if nil == a then E('Could not open ' .. l .. ' - ' .. e) else
             for k, v in pairs(metadata) do
                 a:write(k .. '=' .. v .. '\n')
             end
@@ -277,7 +277,7 @@ for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md
                 os.execute('rm ' .. unsort .. tp .. '.HTML')
                 os.execute('rm ' .. unsort .. tp .. '.md')
                 a, e = io.open(unsort .. tp .. '.HTML', 'w')
-                if nil == a then print('Could not open ' .. unsort .. tp .. '.HTML' .. ' - ' .. e) else
+                if nil == a then E('Could not open ' .. unsort .. tp .. '.HTML' .. ' - ' .. e) else
                     local dst = l:sub(1, -4) .. '.HTML'
                     local cnt = 1
                     for j = 1, #metadata.ogFile do
@@ -292,7 +292,7 @@ for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md
 </html>
 ]=])
                     a:close()
-                    print('REDIRECT ' .. unsort .. tp .. '.HTML \t-> ' .. dst)
+                    W('REDIRECT ' .. unsort .. tp .. '.HTML \t-> ' .. dst)
                 end
 
             end
@@ -306,7 +306,7 @@ for l in io.popen('find -L ' .. Folder .. ' -name "*.HTM" -type f,l -printf "%P\
     local htime = io.popen('date -ur ' ..            l ..           ' +%s'):read('l')
     local mtime = io.popen('date -ur ' .. l:sub(1, -4) .. 'md +%s 2>/dev/null'):read('l')
     if (nil == mtime) or (htime > mtime) then
-        print('pandoc converting '  .. l .. ' -> ' .. string.sub(l, 1, -4) .. 'md')
+        I('pandoc converting '  .. l .. ' -> ' .. l:sub(1, -4) .. 'md')
 os.execute('cp ' .. l .. ' ' .. l .. '_ORIGINAL0')
         -- Open the HTM files and do the initial cleanups, then pandoc them.
         h = io.open(l, 'r')
@@ -363,19 +363,19 @@ writeString(l .. '_ORIGINAL1', body)
                         if ('pub/' == url:sub(1, 4)) then
 -- FIXME? - evil hack?
                             url = 'Foswiki/' .. url
---print('FOSWIKI HTM ' .. url)
+--D('FOSWIKI HTM ' .. url)
                         else
                             url = nil
                         end
                     end
---print('HTM0 ' .. string.sub(body, beg, en + 84) .. ' \t\t')
+--D('HTM0 ' .. body:sub(beg, en + 84) .. ' \t\t')
                     beg, en, body, here = commonLinky(l, body, 'https://fos.wiki.devuan.org/', url, beg, en, beg0, en0, 1)
---if nil ~= en then print('HTM1 ' .. string.sub(body, beg, en + 84) .. ' \t\t') end
+--if nil ~= en then D('HTM1 ' .. body:sub(beg, en + 84) .. ' \t\t') end
 --[=[
                 if nil == url then
-                    print('OOPS! unknown linky  - @' .. l .. '\t\t\t' .. string.sub(body, beg - 9, en) .. ' ' .. string.sub(body, en + 1, en0))
+                    W('OOPS! unknown linky  - @' .. l .. '\t\t\t' .. body:sub(beg - 9, en) .. ' ' .. body:sub(en + 1, en0))
                 else
---                  print('   linky  - @' .. l .. '\t\t\t' .. string.sub(body, beg - 9, en) .. ' ' .. string.sub(body, en + 1, en0) .. ' -> ' .. url)
+--                  I('   linky  - @' .. l .. '\t\t\t' .. body:sub(beg - 9, en) .. ' ' .. body:sub(en + 1, en0) .. ' -> ' .. url)
                     local md = readMdMd(url, {})
 --                  if nil ~= md then
                         if nil ~= md.realURL then url = md.realURL end
@@ -440,9 +440,9 @@ writeString(l .. '_ORIGINAL1', body)
                     else
                         url = nil
                     end
---print('HTM0 ' .. string.sub(body, beg, en + 84) .. ' \t\t')
+--D('HTM0 ' .. body:sub(beg, en + 84) .. ' \t\t')
                     beg, en, body, here = commonLinky(l, body, "'https://wiki.devuan.org/", url, beg, en, beg0, en0, 0)
---if nil ~= en then print('HTM1 ' .. string.sub(body, beg, en + 84) .. ' \t\t') end
+--if nil ~= en then D('HTM1 ' .. body:sub(beg, en + 84) .. ' \t\t') end
                 end
 
                 writeString(l .. '_NEW', body)
@@ -518,13 +518,13 @@ end
 -- Find empty subs.
 for name, sub in pairs(Subs) do
     if 0 == #sub.files then
-        print("EMPTY " .. name)
+        W('EMPTY ' .. name)
         h = io.open(name .. '/index.md', 'w')
         if nil ~= h then
             h:write('This folder has no files.')
             h:close()
         else
-            print("Can't open " .. name .. '/index.md for writing.')
+            E("Can't open " .. name .. '/index.md for writing.')
         end
     end
 end
@@ -588,14 +588,14 @@ local linkFrom = function(source, dest)
     local lnk = ''
     if source ~= dest then
         if nil == Subs[source] then
---          print('!!!! No idea where to find source ' .. source)
+--          W('!!!! No idea where to find source ' .. source)
             return 'DUNNO'
         end
         if nil == Subs[dest] then
             if dest == Subs[source].bit then
                 return ''
             else
---              print('!!!! No idea where to find dest   ' .. dest .. ' from ' .. Subs[source].path .. ' / ' .. Subs[source].bit)
+--              W('!!!! No idea where to find dest   ' .. dest .. ' from ' .. Subs[source].path .. ' / ' .. Subs[source].bit)
                 return 'DUNNO'
             end
         end
@@ -661,7 +661,7 @@ if nil ~= h then
     h:write(Bdy)
     h:close()
 else
-    print("Can't open everything.md for writing.")
+    E"Can't open everything.md for writing."
 end
 toFile('everything', 'body', Bdy)
 
@@ -801,9 +801,9 @@ local lunaLinky = function(url, lab, tit)		-- Fix up the links.
                     else
                         if nil == xlnk then xlnk = string.gsub(ur:gsub('%..*', '', 1), '/.*', '', 1) end
                         if '' ~= Context.path then xlnk = linkFrom(Context.path, xlnk) end
-                        if 'DUNNO/' == xlnk then print('OOPS! page not found - @' .. Context.path .. ' / ' .. Context.bit .. '\t' .. url .. ' -> ' .. xlnk .. ' ' .. string.gsub(ur, '.*%.', '', 1) .. '.HTML') end
                         if '/' == xlnk:sub(1, 1) then xlnk = xlnk:sub(2) end
                         if ('' ~= xlnk) and ('/' ~= xlnk:sub(-1)) then xlnk = xlnk .. '/' end
+                        if 'DUNNO/' == xlnk then E('OOPS! page not found - @' .. Context.path .. ' / ' .. Context.bit .. '\t' .. url .. ' -> ' .. xlnk .. ' ' .. ur:gsub('.*%.', '', 1) .. '.HTML') end
                     end
 --              if (nil ~= md) and (nil ~= md.realURL) then     url = md.realURL
 --              else
@@ -997,8 +997,8 @@ for name, file in pairs(Files) do
 
         -- Write the file.
         if '' ~= result then
---          print('From ' .. name .. '.md -> ' .. base)
             writeString(name .. '.HTML', result)
+--          D('From ' .. name .. '.md -> ' .. base)
         end
     end
 end